料单功能改为仓库通用版的,仓库管理去除BOM校验.优化代码

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 8.0及以上系统需要添加此权限才能弹出APP安装界面 -->
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />  <!-- 高版本安装APP需要的权限(如安卓12) -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -70,7 +70,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="erp.erp.punaier_wms.fileprovider"
+            android:authorities="erp.erp.jiaweisi_wms.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:replace="android:authorities">

app/src/main/java/uas/erp/jiaweisi_wms/fragment/BarcodeGenerationFragment.java

@@ -358,7 +358,7 @@ public class BarcodeGenerationFragment extends BaseFragment implements View.OnCl
                                             Intent intent = new Intent(Intent.ACTION_VIEW);
                                             File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(mActivity, "PrinterShare.apk");
                                             if (Build.VERSION.SDK_INT >= 24) {
-                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.punaier_wms", assetsFileToCacheDir);
+                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.jiaweisi_wms", assetsFileToCacheDir);
                                                 //Granting Temporary Permissions to a URI
                                                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                                 intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/uas/erp/jiaweisi_wms/fragment/BarcodeSupplePrintFragment.java

@@ -214,7 +214,7 @@ public class BarcodeSupplePrintFragment extends BaseFragment {
                                             Intent intent = new Intent(Intent.ACTION_VIEW);
                                             File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(mActivity, "PrinterShare.apk");
                                             if (Build.VERSION.SDK_INT >= 24) {
-                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.punaier_wms", assetsFileToCacheDir);
+                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.jiaweisi_wms", assetsFileToCacheDir);
                                                 //Granting Temporary Permissions to a URI
                                                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                                 intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/uas/erp/jiaweisi_wms/fragment/GoodOrBadFragment.java

@@ -625,7 +625,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                                 String pi_whcode = dataObject.getString("PI_WHCODE") == null ? "" : dataObject.getString("PI_WHCODE");
                                 String pi_whname = dataObject.getString("PI_WHNAME") == null ? "" : dataObject.getString("PI_WHNAME");
                                 jumpToStorageInAddDetail(pi_id,pi_inoutno,pi_whcode,pi_whname);
-
                             }
                         }
                     }

app/src/main/java/uas/erp/jiaweisi_wms/fragment/MSDSplitFragment.java

@@ -294,7 +294,7 @@ public class MSDSplitFragment extends BaseFragment implements View.OnClickListen
                                     Intent intent = new Intent(Intent.ACTION_VIEW);
                                     File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(getActivity(), "PrinterShare.apk");
                                     if (Build.VERSION.SDK_INT >= 24) {
-                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.punaier_wms", assetsFileToCacheDir);
+                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.jiaweisi_wms", assetsFileToCacheDir);
                                         //Granting Temporary Permissions to a URI
                                         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                         intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/uas/erp/jiaweisi_wms/fragment/VersionUpgradeFragment.java

@@ -237,7 +237,7 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                         Intent intent = new Intent(Intent.ACTION_VIEW);
                         if (Build.VERSION.SDK_INT >= 24) {
                             Uri apkUri = FileProvider.getUriForFile(mActivity,
-                                    "erp.erp.punaier_wms.fileprovider", apk);
+                                    "erp.erp.jiaweisi_wms.fileprovider", apk);
                             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                             intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/uas/erp/jiaweisi_wms/fragment/WHBreakingBatchFragment.java

@@ -520,7 +520,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
                                     Intent intent = new Intent(Intent.ACTION_VIEW);
                                     File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(getActivity(), "PrinterShare.apk");
                                     if (Build.VERSION.SDK_INT >= 24) {
-                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.punaier_wms", assetsFileToCacheDir);
+                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.jiaweisi_wms", assetsFileToCacheDir);
                                         //Granting Temporary Permissions to a URI
                                         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                         intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/uas/erp/jiaweisi_wms/fragment/WHCheckContentFragment.java

@@ -72,21 +72,21 @@ public class WHCheckContentFragment extends BaseFragment implements AdapterView.
                 getFragmentManager().beginTransaction().addToBackStack(null)
                         .replace(R.id.container_function_fragment,fragment).commit();
                 break;
-            //包装信息核查
-            case GloableParams.LISTNAME_WH_CHECKCONTENT_PACKAGE:
-                getFragmentManager().beginTransaction().addToBackStack(null)
-                        .replace(R.id.container_function_fragment,new WHCheckPackageFragment()).commit();
-                break;
-            //工单完工品核查
-            case GloableParams.LISTNAME_WH_CHECKCONTENT_MAKEFINISH:
-                getFragmentManager().beginTransaction().addToBackStack(null)
-                        .replace(R.id.container_function_fragment,new WHCheckMakeFinFragment()).commit();
-                break;
-            //订单完工品核查
-            case GloableParams.LISTNAME_WH_CHECKCONTENT_ORDERFINISH:
-                getFragmentManager().beginTransaction().addToBackStack(null)
-                        .replace(R.id.container_function_fragment,new WHCheckOrderFinFragment()).commit();
-                break;
+//            //包装信息核查
+//            case GloableParams.LISTNAME_WH_CHECKCONTENT_PACKAGE:
+//                getFragmentManager().beginTransaction().addToBackStack(null)
+//                        .replace(R.id.container_function_fragment,new WHCheckPackageFragment()).commit();
+//                break;
+//            //工单完工品核查
+//            case GloableParams.LISTNAME_WH_CHECKCONTENT_MAKEFINISH:
+//                getFragmentManager().beginTransaction().addToBackStack(null)
+//                        .replace(R.id.container_function_fragment,new WHCheckMakeFinFragment()).commit();
+//                break;
+//            //订单完工品核查
+//            case GloableParams.LISTNAME_WH_CHECKCONTENT_ORDERFINISH:
+//                getFragmentManager().beginTransaction().addToBackStack(null)
+//                        .replace(R.id.container_function_fragment,new WHCheckOrderFinFragment()).commit();
+//                break;
         }
 
     }

app/src/main/java/uas/erp/jiaweisi_wms/fragment/WHCombineBatchFragment.java

@@ -366,7 +366,7 @@ public class WHCombineBatchFragment extends BaseFragment implements View.OnClick
                                     Intent intent = new Intent(Intent.ACTION_VIEW);
                                     File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(getActivity(), "PrinterShare.apk");
                                     if (Build.VERSION.SDK_INT >= 24) {
-                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.punaier_wms", assetsFileToCacheDir);
+                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "erp.erp.jiaweisi_wms", assetsFileToCacheDir);
                                         //Granting Temporary Permissions to a URI
                                         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                         intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/uas/erp/jiaweisi_wms/global/GloableParams.java

@@ -596,9 +596,9 @@ public class GloableParams {
 
 
     //库存条码绑定
-    private static final String ADDRESSTAIL_INVENTORYBINDING="/api/pda/receiving/stocksaveBarcode2Confirm.action";
+    private static final String ADDRESSTAIL_INVENTORYBINDING = "/api/pda/receiving/stocksaveBarcode2Confirm.action";
     private static final String ADDRESSTAIL_RECEIVING_INVENTORYBINDING2 = "/api/pda/receiving/stocksaveBarcode2.action";
-    private static final String ADDRESSTAIL_GET_PRINTSUMLABEL="/api/pda/outMaterial/printSumLabel.action";
+    private static final String ADDRESSTAIL_GET_PRINTSUMLABEL = "/api/pda/outMaterial/printSumLabel.action";
     //确认入库
     private static final String ADDRESSTAIL_RECEIVING_NEWBAOCODEIO = "/api/pda/receiving/newBaocodeio.action";
     //单据过账
@@ -609,7 +609,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_JLT_RECEIVING_BARCODEPARSE = "/api/pda/receiving/barcodeParse.action";
     //入库采集
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETINDATALIST = "/api/pda/receiving/getInDataList.action";
-    private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM="/api/pda/receiving/saveBarcode2Confirm.action";
+    private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM = "/api/pda/receiving/saveBarcode2Confirm.action";
     private static final String ADDRESSTAIL_RECEIVING_SAVEBARCODE2 = "/api/pda/receiving/saveBarcode2.action";
     private static final String ADDRESSTAIL_JLT_RECEIVING_CHECKOUTBOX = "/api/pda/receiving/checkOutBox.action";
     private static final String ADDRESSTAIL_JLT_RECEIVING_DELETEOUTBOX = "/api/pda/receiving/deleteOutBox.action";
@@ -618,14 +618,12 @@ public class GloableParams {
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETCOLLECTLISTBYBOX = "/api/pda/receiving/getCollectListByBox.action";
     private static final String ADDRESSTAIL_PDAIOOUT_DELETEALLPREBIO = "/api/pdaio/pdaioOut/deleteAllPrebio.action";
     private static final String ADDRESSTAIL_PDAIOOUT_DELELTEPREBIOBYID = "/api/pdaio/pdaioOut/deleltePreBioById.action";
-    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE="/api/pda/receiving/deleteAllBarDetails.action";
-    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT="/api/pda/receiving/getNeedList2.action";
+    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE = "/api/pda/receiving/deleteAllBarDetails.action";
+    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT = "/api/pda/receiving/getNeedList2.action";
     private static String ADDRESSTAIL_RECHARGE_AUTIQC = "/api/pda/QCToPurcCheckin/autiQc.action";
     private static String ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE = "/api/pda/QCToPurcCheckin/turnPurcBarCode.action";
 
 
-
-
     /**
      * 完工品入库
      */
@@ -730,10 +728,10 @@ public class GloableParams {
     //新收料单
     private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO = "/api/pda/receiving/getPreInDataList.action";
     private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_ADD = "/api/pda/inMaterial/saveVerifyApply.action";
-    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT="/scm/purchase/submitVerifyApply.action";
-    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_LIST="/api/pda/inMaterial/getVerifyApply.action";
-    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL="/api/pda/inMaterial/getVerifyApplyDetail.action";
-    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT="/scm/purchase/auditVerifyApply.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT = "/scm/purchase/submitVerifyApply.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_LIST = "/api/pda/inMaterial/getVerifyApply.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL = "/api/pda/inMaterial/getVerifyApplyDetail.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT = "/scm/purchase/auditVerifyApply.action";
 
     //入库单列表
     private static final String ADDRESSTAIL_DELIVERYORDERDETAIL = "/api/pda/receiving/makeCollectList.action";
@@ -801,8 +799,8 @@ public class GloableParams {
     public static final String GRIDNAME_STORAGE_TRANSFER = "储位转移";
     public static final String GRIDNAME_STOCK_BARCODE = "补贴库存条码";
     public static final String GRIDNAME_WORK_INVENTORY = "盘点作业";
-//    public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
-//    public static final String GRIDNAME_BOM_CHECK = "BOM校验";
+    //    public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
+    //    public static final String GRIDNAME_BOM_CHECK = "BOM校验";
     public static final String MENU_STORAGE_STOCK_INFO_COLLECT = "库存条码绑定";
     public static final String MENU_STORAGE_BARCODE_FREEZE = "库存条码冻结";
     public static final String GRIDNAME_FINISHED_PRODUCT_STORAGE = "成品入库";
@@ -811,9 +809,9 @@ public class GloableParams {
             GRIDNAME_GOOD_SEARCH,
             GRIDNAME_BATCH_OPRATION,
             GRIDNAME_STORAGE_TRANSFER,
-//            GRIDNAME_MODIFY_QUANTITY,
+            //            GRIDNAME_MODIFY_QUANTITY,
             GRIDNAME_WORK_INVENTORY,
-//            GRIDNAME_BOM_CHECK,
+            //            GRIDNAME_BOM_CHECK,
             MENU_STORAGE_STOCK_INFO_COLLECT,
             MENU_STORAGE_BARCODE_FREEZE,
             GRIDNAME_FINISHED_PRODUCT_STORAGE,
@@ -823,9 +821,9 @@ public class GloableParams {
             R.drawable.storage_good_search,
             R.drawable.storage_bach_operation,
             R.drawable.storage_transfer,
-//            R.drawable.storage_work_inventory,
+            //            R.drawable.storage_work_inventory,
             R.drawable.ic_modify_quantity,
-//            R.drawable.storage_msd_manager,
+            //            R.drawable.storage_msd_manager,
             R.drawable.storage_transfer,
             R.drawable.kucuntiaomadongjie,
             R.drawable.ic_finished_product_storage,
@@ -867,42 +865,42 @@ public class GloableParams {
 
     //-->入库管理
     public static final String MENU_STORAGE_RECHARGE = "收料单";
-//    public static final String MENU_STORAGE_INSPECTION = "送检";
-//    public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC检验";
-//    public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "单据入库";
+    //    public static final String MENU_STORAGE_INSPECTION = "送检";
+    //    public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC检验";
+    //    public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "单据入库";
     //    public static final String MENU_STORAGE_PRODUCT_CHECK = "成品检验";
-//    public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
-//    public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
+    //    public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
+    //    public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
     public static final String MENU_STORAGE_BARCODE_IN = "条码入库";
     public static final String MENU_STORAGE_BARCODE_INFO_COLLECT = "条码信息采集";
-//    public static final String MENU_STORAGE_BARCODECJI_IN = "入库采集";
-//    public static final String MENU_STORAGE_INVENTORY_DETAILS_QUERY = "入库明细查询";
-        public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
+    //    public static final String MENU_STORAGE_BARCODECJI_IN = "入库采集";
+    //    public static final String MENU_STORAGE_INVENTORY_DETAILS_QUERY = "入库明细查询";
+    public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
 
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE,
-//            MENU_STORAGE_INSPECTION,
-//            MENU_STORAGE_IQC_STORAGE_IN,
-//            MENU_STORAGE_MATERIAL_STORAGE_IN,
-//            MENU_STORAGE_PRODUCT_STORAGE_IN,
-//            MENU_STORAGE_RANDOM_CHECK,
+            //            MENU_STORAGE_INSPECTION,
+            //            MENU_STORAGE_IQC_STORAGE_IN,
+            //            MENU_STORAGE_MATERIAL_STORAGE_IN,
+            //            MENU_STORAGE_PRODUCT_STORAGE_IN,
+            //            MENU_STORAGE_RANDOM_CHECK,
             MENU_STORAGE_BARCODE_IN,
             MENU_STORAGE_BARCODE_INFO_COLLECT,
-//            MENU_STORAGE_BARCODECJI_IN,
-//            MENU_STORAGE_INVENTORY_DETAILS_QUERY
+            //            MENU_STORAGE_BARCODECJI_IN,
+            //            MENU_STORAGE_INVENTORY_DETAILS_QUERY
             GRIDNAME_MODIFY_QUANTITY
     };
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge,
-//            R.drawable.ic_storage_inspection,
-//            R.drawable.ic_storage_iqc,
-//            R.drawable.ic_storage_material_in,
-//            R.drawable.ic_storage_finish_in,
-//            R.drawable.ic_storage_random_check,
+            //            R.drawable.ic_storage_inspection,
+            //            R.drawable.ic_storage_iqc,
+            //            R.drawable.ic_storage_material_in,
+            //            R.drawable.ic_storage_finish_in,
+            //            R.drawable.ic_storage_random_check,
             R.drawable.ic_storage_barcode_in,
             R.drawable.ic_barcode_info_collect,
-//            R.drawable.ic_storage_barcode_in,
-//            R.drawable.rukumingxichaxun
+            //            R.drawable.ic_storage_barcode_in,
+            //            R.drawable.rukumingxichaxun
             R.drawable.storage_work_inventory
     };
 
@@ -923,13 +921,23 @@ public class GloableParams {
     //-->仓库管理：货物核查
     public static final String LISTNAME_WH_CHECKCONTENT_MAKEMATERIAL = "物料库存核查";
     public static final String LISTNAME_WH_CHECKCONTENT_BARCODE = "条码信息核查";
-    public static final String LISTNAME_WH_CHECKCONTENT_PACKAGE = "包装信息核查";
-    public static final String LISTNAME_WH_CHECKCONTENT_MAKEFINISH = "工单完工品核查";
-    public static final String LISTNAME_WH_CHECKCONTENT_ORDERFINISH = "订单完工品核查";
-    public static final String[] mmindexListName = {LISTNAME_WH_CHECKCONTENT_MAKEMATERIAL, LISTNAME_WH_CHECKCONTENT_BARCODE,
-            LISTNAME_WH_CHECKCONTENT_PACKAGE, LISTNAME_WH_CHECKCONTENT_MAKEFINISH, LISTNAME_WH_CHECKCONTENT_ORDERFINISH};
-    public static final int[] mmindexListImg = {R.drawable.ic_menu_head, R.drawable.ic_menu_head,
-            R.drawable.ic_menu_head, R.drawable.ic_menu_head, R.drawable.ic_menu_head};
+//    public static final String LISTNAME_WH_CHECKCONTENT_PACKAGE = "包装信息核查";
+//    public static final String LISTNAME_WH_CHECKCONTENT_MAKEFINISH = "工单完工品核查";
+//    public static final String LISTNAME_WH_CHECKCONTENT_ORDERFINISH = "订单完工品核查";
+    public static final String[] mmindexListName = {
+            LISTNAME_WH_CHECKCONTENT_MAKEMATERIAL,
+            LISTNAME_WH_CHECKCONTENT_BARCODE,
+//            LISTNAME_WH_CHECKCONTENT_PACKAGE,
+//            LISTNAME_WH_CHECKCONTENT_MAKEFINISH,
+//            LISTNAME_WH_CHECKCONTENT_ORDERFINISH
+    };
+    public static final int[] mmindexListImg = {
+            R.drawable.ic_menu_head,
+            R.drawable.ic_menu_head,
+//            R.drawable.ic_menu_head,
+//            R.drawable.ic_menu_head,
+//            R.drawable.ic_menu_head
+    };
     //INDEX:setting Index
 
 
@@ -1164,9 +1172,9 @@ public class GloableParams {
         GloableParams.ADDRESS_OUTMATERIAL_GETPREMATERIALLIST = uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_GETPREMATERIALLIST;
 
 
-        GloableParams.ADDRESS_INVENTORYBINDING= uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
-        GloableParams.ADDRESS_INVENTORYBINDING2= uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
-        GloableParams.ADDRESS_ADDRESSTAIL_PRINTSUMLABEL= uriHead + GloableParams.ADDRESSTAIL_GET_PRINTSUMLABEL;
+        GloableParams.ADDRESS_INVENTORYBINDING = uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
+        GloableParams.ADDRESS_INVENTORYBINDING2 = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
+        GloableParams.ADDRESS_ADDRESSTAIL_PRINTSUMLABEL = uriHead + GloableParams.ADDRESSTAIL_GET_PRINTSUMLABEL;
         GloableParams.ADDRESS_RECEIVING_NEWBAOCODEIO = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_NEWBAOCODEIO;
         GloableParams.ADDRESS_PDAIO_CONFIRMPOST = uriHead + GloableParams.ADDRESSTAIL_PDAIO_CONFIRMPOST;
         GloableParams.ADDRESS_RECEIVING_BARCODEPARSE2 = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_BARCODEPARSE2;
@@ -1183,9 +1191,9 @@ public class GloableParams {
         GloableParams.ADDRESS_PDAIOOUT_DELELTEPREBIOBYID = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_DELELTEPREBIOBYID;
         GloableParams.ADDRESS_PDAIO_GET_lOGINDELETE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_lOGINDELETE;
         GloableParams.ADDRESS_PUTMATERIAL_TOADOPTPROMPT = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_AUTIQC= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_AUTIQC;
-        GloableParams.ADDRESS_TURNPURCBARCODE= uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE;
-        GloableParams.ADDRESS_INVENTORY_DETAILS_QUERY= uriHead + GloableParams.ADDRESSTAIL_INVENTORY_DETAILS_QUERY;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_AUTIQC = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_AUTIQC;
+        GloableParams.ADDRESS_TURNPURCBARCODE = uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE;
+        GloableParams.ADDRESS_INVENTORY_DETAILS_QUERY = uriHead + GloableParams.ADDRESSTAIL_INVENTORY_DETAILS_QUERY;
 
         GloableParams.ADDRESS_GET_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_BARCODE_DATA;
         GloableParams.ADDRESS_GET_PRE_MATERIAL_LIST = uriHead + GloableParams.ADDRESSTAIL_GET_PRE_MATERIAL_LIST;
@@ -1193,20 +1201,20 @@ public class GloableParams {
         GloableParams.ADDRESS_GET_INVENTORY_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA;
         GloableParams.ADDRESS_GET_INVENTORY_BARCODE_FREEZE = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_FREEZE;
 
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_ADD= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_ADD;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_LIST= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_LIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_ADD = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_ADD;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_LIST = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_LIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT;
 
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL= uriHead + GloableParams.ADDRESSTAIL_DELIVERYORDERDETAIL;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL = uriHead + GloableParams.ADDRESSTAIL_DELIVERYORDERDETAIL;
 
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST= uriHead + GloableParams.ADDRESSTAIL_MAKECOLLECTBOXLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEOUTWARHOUSE= uriHead + GloableParams.ADDRESSTAIL_MAKEOUTWARHOUSE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST = uriHead + GloableParams.ADDRESSTAIL_MAKECOLLECTBOXLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEOUTWARHOUSE = uriHead + GloableParams.ADDRESSTAIL_MAKEOUTWARHOUSE;
 
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST= uriHead + GloableParams.ADDRESSTAIL_OUTBOUNDLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE= uriHead + GloableParams.ADDRESSTAIL_MAKEINWARHOUSE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST = uriHead + GloableParams.ADDRESSTAIL_OUTBOUNDLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE = uriHead + GloableParams.ADDRESSTAIL_MAKEINWARHOUSE;
 
         GloableParams.ADDRESS_PDAIO_IN_GETWHCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_GETWHCODE;
         GloableParams.ADDRESS_OUTMATERIAL_NEWPRODINOUT = uriHead + GloableParams.ADDRESSTAIL_COUNTING_NEWPRODINOUT;

app/src/main/java/uas/erp/jiaweisi_wms/util/PrintUtils.java

@@ -13,7 +13,7 @@ import uas.erp.jiaweisi_wms.tools.SharedPreUtil;
 public class PrintUtils {
 
     public static int printBar(Context context, String dataJson, int dpi, String printTemplate) {
-        Log.e("listArraythree1",dataJson);
+        Log.e("aaa", "打印数据是;"  + dataJson);
         try {
             if (dpi <= 0) {
                 dpi = 203;
@@ -23,7 +23,7 @@ public class PrintUtils {
                 printTemplate = SharedPreUtil.getString(context, Constants.FLAG.PRINT_TEMPLATE_CACHE, "");
             }
 
-//            Log.e("listArraythree2",printTemplate);
+            Log.e("aaa", "模版数据是:" + printTemplate);
 //            int offset = 6,
 //                    h = 400,
 //                    v = 800,
@@ -60,8 +60,13 @@ public class PrintUtils {
                         String printKey = FastjsonUtil.getText(templateObject, "LP_NAME");
 
                         String printText = FastjsonUtil.getText(dataJson, printKey);
-                        Log.e("aaa", "打印内容: " + printText +
-                                ",dataJson:" + dataJson + ",printKey:" + printKey + ",valuetype:" + valuetype);
+                        Log.e("aaa", "打印内容文字: " + printText +
+                                ",打印类型:" + valuetype
+                                + ",左偏移量:" + leftrate + "=" +  printX
+                                + ",顶部偏移量:" + toprate + "=" + printY
+                                + ",高度偏移量:" + barHeight + "=" + barHeightInt
+                                + ",printKey:" + printKey
+                                + ",valuetype:" + valuetype);
 
                         if (valuetype.equals("constant")) {
                             printText = printKey;

app/src/main/res/layout/actionbar_withback.xml

@@ -17,7 +17,7 @@
             style="@style/ActionBarTextView"
             android:layout_width="wrap_content"
             android:text="!!!" />
-        <!--<erp.erp.punaier_wms.customview.ClearableEditText
+        <!--<erp.erp.jiaweisi_wms.customview.ClearableEditText
             android:id="@+id/et_actionbar_withback"
             style="@style/ActionBarEditText"/>-->
         <!--<EditText

app/src/main/res/layout/fragment_inmake.xml

@@ -16,7 +16,7 @@
         android:layout_marginBottom="@dimen/space_bottom_7"
         android:gravity="center_vertical"
         android:orientation="horizontal">
-        <com.uas.pda_smart_com.view.SearchButton
+        <uas.erp.jiaweisi_wms.view.SearchButton
             android:id="@+id/btn_showsearch_inmake"
             style="@style/ShowSearchButtonStyle"/>
     </LinearLayout>
@@ -26,7 +26,7 @@
         android:layout_height="match_parent">
 
         <!--List-->
-        <com.uas.pda_smart_com.view.PullToRefreshLayout
+        <uas.erp.jiaweisi_wms.view.PullToRefreshLayout
             android:id="@+id/refresh_view"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
@@ -36,7 +36,7 @@
             <include layout="@layout/refresh_head" />
             <!-- 支持所有实现Pullable接口的View -->
 
-            <com.uas.pda_smart_com.view.PullableListView
+            <uas.erp.jiaweisi_wms.view.PullableListView
                 android:id="@+id/content_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -46,7 +46,7 @@
 
             <include layout="@layout/load_more" />
 
-        </com.uas.pda_smart_com.view.PullToRefreshLayout>
+        </uas.erp.jiaweisi_wms.view.PullToRefreshLayout>
         <include layout="@layout/null_item"/>
     </RelativeLayout>
 </LinearLayout>

app/src/main/res/layout/fragment_iocout_make_material.xml

@@ -15,7 +15,7 @@
             android:layout_marginBottom="@dimen/space_bottom_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
-            <erp.erp.punaier_wms.view.SearchButton
+            <erp.erp.jiaweisi_wms.view.SearchButton
                 android:text="出库单号"
                 android:id="@+id/in_out_no"
                 style="@style/ShowSearchButtonStyle"/>

app/src/main/res/layout/fragment_jlt_storage_in_filter_list.xml

@@ -38,6 +38,8 @@
 
 
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
         android:id="@+id/pda_wms_in_filter_list_srl"
         android:layout_width="match_parent"
         android:layout_height="0dp"

app/src/main/res/layout/fragment_material_storage.xml

@@ -69,7 +69,7 @@
         android:layout_height="match_parent">
 
         <!–List–>
-        <erp.erp.punaier_wms.view.PullToRefreshLayout
+        <erp.erp.jiaweisi_wms.view.PullToRefreshLayout
             android:id="@+id/refresh_view"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
@@ -79,7 +79,7 @@
             <include layout="@layout/refresh_head" />
             &lt;!&ndash; 支持所有实现Pullable接口的View &ndash;&gt;
 
-            <erp.erp.punaier_wms.view.PullableListView
+            <erp.erp.jiaweisi_wms.view.PullableListView
                 android:id="@+id/material_storage_plv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -89,7 +89,7 @@
 
             <include layout="@layout/load_more" />
 
-        </erp.erp.punaier_wms.view.PullToRefreshLayout>
+        </erp.erp.jiaweisi_wms.view.PullToRefreshLayout>
         <include layout="@layout/null_item"/>
     </RelativeLayout>-->
 

app/src/main/res/layout/fragment_revoke_stock.xml

@@ -328,7 +328,7 @@
                     android:text="全选" />
             </RelativeLayout>
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.jiaweisi_wms.view.MostListView
                 android:id="@+id/revoke_stock_in_list_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -382,8 +382,7 @@
                     android:visibility="invisible" />
             </RelativeLayout>
 
-
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.jiaweisi_wms.view.MostListView
                 android:id="@+id/revoke_stock_out_list_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

app/src/main/res/layout/fragment_scmake_feederget.xml

@@ -96,9 +96,9 @@
         <TextView
             style="@style/CardTitleStyle"
             android:text="@string/text_search_collect_fragment_scmake"/>
-        <com.uas.pda_smart_com.view.CustomScrollView
+        <uas.erp.jiaweisi_wms.view.CustomScrollView
             style="@style/CardTextblockStyle">
             <include layout="@layout/innermsg_collect_pfmake"/>
-        </com.uas.pda_smart_com.view.CustomScrollView>
+        </uas.erp.jiaweisi_wms.view.CustomScrollView>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/fragment_scmake_prepare.xml

@@ -6,7 +6,7 @@
     android:background="@color/white">
 
     <!--List-->
-    <com.uas.pda_smart_com.view.PullToRefreshLayout
+    <uas.erp.jiaweisi_wms.view.PullToRefreshLayout
         android:id="@+id/refresh_view_makeprepare"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
@@ -16,7 +16,7 @@
         <include layout="@layout/refresh_head" />
         <!-- 支持所有实现Pullable接口的View -->
 
-        <com.uas.pda_smart_com.view.PullableListView
+        <uas.erp.jiaweisi_wms.view.PullableListView
             android:id="@+id/content_list_makeprepare"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -26,6 +26,6 @@
 
         <include layout="@layout/load_more" />
 
-    </com.uas.pda_smart_com.view.PullToRefreshLayout>
+    </uas.erp.jiaweisi_wms.view.PullToRefreshLayout>
     <include layout="@layout/null_item"/>
 </RelativeLayout>

app/src/main/res/layout/fragment_scmake_prepareget.xml

@@ -26,10 +26,10 @@
         <TextView
             style="@style/CardTitleStyle"
             android:text="@string/text_search_collect_fragment_scmake"/>
-        <com.uas.pda_smart_com.view.CustomScrollView
+        <uas.erp.jiaweisi_wms.view.CustomScrollView
             style="@style/CardTextblockStyle">
             <include layout="@layout/innermsg_collect_scmake"/>
-        </com.uas.pda_smart_com.view.CustomScrollView>
+        </uas.erp.jiaweisi_wms.view.CustomScrollView>
     </LinearLayout>
     <!--下部：提示TextView+显示ListView-->
     <LinearLayout
@@ -42,7 +42,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <com.uas.pda_smart_com.view.PullToRefreshLayout
+            <uas.erp.jiaweisi_wms.view.PullToRefreshLayout
                 android:id="@+id/refresh_view_scmake_collect"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
@@ -52,7 +52,7 @@
                 <include layout="@layout/refresh_head" />
                 <!-- 支持所有实现Pullable接口的View -->
 
-                <com.uas.pda_smart_com.view.PullableListView
+                <uas.erp.jiaweisi_wms.view.PullableListView
                     android:id="@+id/content_view_scmake_collect"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -62,7 +62,7 @@
 
                 <include layout="@layout/load_more" />
 
-            </com.uas.pda_smart_com.view.PullToRefreshLayout>
+            </uas.erp.jiaweisi_wms.view.PullToRefreshLayout>
             <include layout="@layout/null_item"/>
         </RelativeLayout>
     </LinearLayout>

app/src/main/res/layout/fragment_scmake_smtfeederchild_check.xml

@@ -120,7 +120,7 @@
                             android:textColor="@color/body_text_1"
                             android:textSize="16sp" />
 
-                        <!--<erp.erp.punaier_wms.view.ClearableEditText-->
+                        <!--<erp.erp.jiaweisi_wms.view.ClearableEditText-->
                         <!--android:id="@+id/smt_check_location_et"-->
                         <!--style="@style/EditTextLineStyle"-->
                         <!--android:layout_width="0dp"-->
@@ -135,7 +135,7 @@
                             android:layout_weight="1"
                             android:orientation="horizontal">
 
-                            <com.uas.pda_smart_com.view.TextViewWithButton
+                            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                                 android:id="@+id/smt_check_location_tv"
                                 style="@style/EditTextLineEnableStyle"
                                 android:layout_width="0dp"
@@ -162,7 +162,7 @@
                             android:textColor="@color/body_text_1"
                             android:textSize="16sp" />
                         <!--
-                                            <erp.erp.punaier_wms.view.ClearableEditText
+                                            <erp.erp.jiaweisi_wms.view.ClearableEditText
                                                 android:id="@+id/smt_check_prodcode_et"
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_width="0dp"

app/src/main/res/layout/fragment_scmake_smtfeederchild_down.xml

@@ -91,7 +91,7 @@
 
                 <include layout="@layout/innermsg_collect_scmake" />
 
-                <com.uas.pda_smart_com.view.MostListView
+                <uas.erp.jiaweisi_wms.view.MostListView
                     android:id="@+id/smt_down_material_result_lv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />

app/src/main/res/layout/fragment_scmake_smtfeederchild_in.xml

@@ -78,7 +78,7 @@
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
-                    <com.uas.pda_smart_com.view.TextViewWithButton
+                    <uas.erp.jiaweisi_wms.view.TextViewWithButton
                         android:id="@+id/smt_feeding_in_location_tv"
                         style="@style/EditTextLineEnableStyle"
                         android:layout_width="0dp"

app/src/main/res/layout/fragment_scmake_smtfeederchild_jointchange.xml

@@ -78,7 +78,7 @@
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
-                    <com.uas.pda_smart_com.view.TextViewWithButton
+                    <uas.erp.jiaweisi_wms.view.TextViewWithButton
                         android:id="@+id/smt_change_location_tv"
                         style="@style/EditTextLineEnableStyle"
                         android:layout_width="0dp"
@@ -102,7 +102,7 @@
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
-                    <com.uas.pda_smart_com.view.TextViewWithButton
+                    <uas.erp.jiaweisi_wms.view.TextViewWithButton
                         android:id="@+id/smt_change_feeder_tv"
                         style="@style/EditTextLineEnableStyle"
                         android:layout_width="0dp"

app/src/main/res/layout/fragment_scmake_smtfeederchild_query.xml

@@ -327,7 +327,7 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.jiaweisi_wms.view.MostListView
                 android:id="@+id/smt_query_diff_not_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -376,10 +376,11 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.jiaweisi_wms.view.MostListView
                 android:id="@+id/smt_query_diff_error_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
+
         </LinearLayout>
 
     </com.handmark.pulltorefresh.library.PullToRefreshScrollView>

app/src/main/res/layout/fragment_sound_setting.xml

@@ -20,7 +20,7 @@
             android:text="振动"
             android:textSize="@dimen/textsize_18" />
 
-        <com.uas.pda_smart_com.view.SwitchView
+        <uas.erp.jiaweisi_wms.view.SwitchView
             android:id="@+id/sound_setting_Vibration_sv"
             android:layout_width="40dp"
             android:layout_height="25dp"

app/src/main/res/layout/include_scmake_smtfeederchild_add.xml

@@ -42,15 +42,15 @@
             android:layout_weight="3"
             android:layout_marginLeft="@dimen/space_left_inner"
             android:gravity="left">
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_location_smtchildadd"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_barcode_smtchildadd"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_remainqty_smtchildadd"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>

app/src/main/res/layout/include_scmake_smtfeederchild_in.xml

@@ -45,19 +45,19 @@
             android:layout_weight="3"
             android:layout_marginLeft="@dimen/space_left_inner"
             android:gravity="left">
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_innernotice_location_smtchildin"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_innernotice_barcode_smtchildin"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_innernotice_remainqty_smtchildin"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>
-            <com.uas.pda_smart_com.view.TextViewWithButton
+            <uas.erp.jiaweisi_wms.view.TextViewWithButton
                 android:id="@+id/tv_innernotice_fecode_smtchildin"
                 style="@style/CardContentTextStyle"
                 android:textColor="@color/text_search"/>

app/src/main/res/layout/item_barcode_supple_print_list.xml

@@ -14,7 +14,7 @@
         tools:text="239439579  minghceng  guige"
         />
 
-    <com.uas.pda_smart_com.view.MostListView
+    <uas.erp.jiaweisi_wms.view.MostListView
         android:id="@+id/barcode_supple_print_list_msg_mlv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>

app/src/main/res/layout/item_list_stock_task_multiple.xml

@@ -166,7 +166,7 @@
             android:text="展开" />
     </LinearLayout>
 
-    <com.uas.pda_smart_com.view.MostListView
+    <uas.erp.jiaweisi_wms.view.MostListView
         android:id="@+id/stock_task_multiple_list_lv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/item_solder_log_query.xml

@@ -63,7 +63,7 @@
             style="@style/CaptionText"
             android:text="操作内容：" />
 
-        <com.uas.pda_smart_com.view.MTextView
+        <uas.erp.jiaweisi_wms.view.MTextView
             android:id="@+id/item_solder_log_query_content_tv"
             style="@style/ValueText"
             tools:text="xxxxxxxxxxxxxx" />

app/src/main/res/layout/popupwin_inmake_search.xml

@@ -1,31 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--入库单搜索PopWin 备料单搜索PopWin 飞达搜索PopWin-->
+<?xml version="1.0" encoding="utf-8"?><!--入库单搜索PopWin 备料单搜索PopWin 飞达搜索PopWin-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_inmake_search"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/ll_inmake_search"
-    android:orientation="vertical"
-    android:background="@color/white">
+    android:background="@color/white"
+    android:orientation="vertical">
 
     <!--上部：搜索框-->
     <LinearLayout
         android:id="@+id/ll_upperlayout_inmake"
         style="@style/PopUpperLayoutStyle">
+
         <RelativeLayout
             android:layout_width="@dimen/search_background"
             android:layout_height="@dimen/search_background"
             android:layout_marginRight="8dp">
+
             <Button
                 android:id="@+id/btn_close_search"
                 style="@style/PopBackButtonStyle" />
         </RelativeLayout>
+
         <LinearLayout
             android:id="@+id/ll_search_inmake"
             style="@style/PopWinEditTextLayoutStyle">
+
             <uas.erp.jiaweisi_wms.view.ClearableEditText
                 android:id="@+id/et_search_inmake"
-                android:hint="@string/hint_search_fragment_inmake"
-                style="@style/PopWinEditTextStyle" />
+                style="@style/PopWinEditTextStyle"
+                android:hint="@string/hint_search_fragment_inmake" />
+
             <Button
                 android:id="@+id/btn_spinner_inmake"
                 style="@style/PopWinEditButtonStyle" />
@@ -35,26 +39,26 @@
              style="@style/PopWinEditTextStyle" />-->
         <TextView
             android:id="@+id/btn_search"
-            style="@style/PopWinButtonStyle"/>
+            style="@style/PopWinButtonStyle" />
     </LinearLayout>
 
     <!--下部：List-->
     <RelativeLayout
-        android:layout_marginTop="@dimen/space_top_8"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/space_top_8">
 
-        <com.uas.pda_smart_com.view.PullToRefreshLayout
+        <uas.erp.jiaweisi_wms.view.PullToRefreshLayout
             android:id="@+id/refresh_view"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp">
 
             <include layout="@layout/refresh_head" />
             <!-- 支持所有实现Pullable接口的View -->
 
-            <com.uas.pda_smart_com.view.PullableListView
+            <uas.erp.jiaweisi_wms.view.PullableListView
                 android:id="@+id/content_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -64,9 +68,9 @@
 
             <include layout="@layout/load_more" />
 
-        </com.uas.pda_smart_com.view.PullToRefreshLayout>
+        </uas.erp.jiaweisi_wms.view.PullToRefreshLayout>
         <!--显示区-->
 
-        <include layout="@layout/null_item"/>
+        <include layout="@layout/null_item" />
     </RelativeLayout>
 </LinearLayout>

app/src/main/res/layout/popwin_dialog_confirm.xml

@@ -1,51 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--确认对话框-->
+<?xml version="1.0" encoding="utf-8"?><!--确认对话框-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#88000000">
+
     <LinearLayout
         android:id="@+id/ll_dialog_confirm"
         style="@style/PopWinStyle">
-        <RelativeLayout
-            style="@style/PopWinContentWithViewStyle">
+
+        <RelativeLayout style="@style/PopWinContentWithViewStyle">
             <!--可见的内容-->
-            <LinearLayout
-                style="@style/PopWinContentStyle">
+            <LinearLayout style="@style/PopWinContentStyle">
+
                 <TextView
                     android:id="@+id/title_dialog_confirm"
                     style="@style/PopWinTitleStyle"
-                    android:text="提示"/>
-                <com.uas.pda_smart_com.view.CustomScrollView
-                    android:layout_below="@id/title_dialog_confirm"
+                    android:text="提示" />
+
+                <uas.erp.jiaweisi_wms.view.CustomScrollView
                     android:id="@+id/sl_popwin_confirm"
-                    android:layout_marginBottom="@dimen/space_bottom_8"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title_dialog_confirm"
+                    android:layout_marginBottom="@dimen/space_bottom_8">
+
                     <TextView
                         android:id="@+id/tv_dialog_confirm_notice"
-                        style="@style/PopWinContentTextStyle"/>
-                </com.uas.pda_smart_com.view.CustomScrollView>
+                        style="@style/PopWinContentTextStyle" />
+                </uas.erp.jiaweisi_wms.view.CustomScrollView>
+
                 <RelativeLayout
                     android:id="@+id/rl_btn_confirmdialog"
-                    android:layout_below="@id/sl_popwin_confirm"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/height_56">
+                    android:layout_height="@dimen/height_56"
+                    android:layout_below="@id/sl_popwin_confirm">
+
                     <Button
                         android:id="@+id/btn_dialog_confirm_ok"
                         style="@style/PopwinOKButtonStyle"
-                        android:text="@string/confirm"/>
+                        android:text="@string/confirm" />
+
                     <Button
                         android:id="@+id/btn_dialog_confirm_cancel"
-                        android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                         style="@style/PopwinCancleButtonStyle"
-                        android:text="@string/cancel"/>
+                        android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
+                        android:text="@string/cancel" />
                 </RelativeLayout>
 
             </LinearLayout>
         </RelativeLayout>
+
         <View
-            android:layout_height="50dp"
-            android:layout_width="match_parent"/>
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/popwin_scmake_withdraw.xml

@@ -36,12 +36,12 @@
                     android:layout_width="match_parent"
                     android:hint="@string/hint_withdrawcollect_fragment_scmake"/>
                 <!--显示服务器信息区域-->
-                <com.uas.pda_smart_com.view.CustomScrollView
+                <uas.erp.jiaweisi_wms.view.CustomScrollView
                     style="@style/CardTextblockStyle">
                     <TextView
                         android:id="@+id/tv_message_withdraw"
                         style="@style/CardContentTextStyle"/>
-                </com.uas.pda_smart_com.view.CustomScrollView>
+                </uas.erp.jiaweisi_wms.view.CustomScrollView >
                 <!--按钮-->
                 <RelativeLayout
                     android:layout_width="match_parent"

app/src/main/res/layout/popwin_whcheck_detail.xml

@@ -45,7 +45,7 @@
         android:layout_below="@id/tl_msg">
         <include layout="@layout/item_list_table_column4"/>
         <!--信息列表-->
-        <com.uas.pda_smart_com.view.CustomScrollView
+        <uas.erp.jiaweisi_wms.view.CustomScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fillViewport="true">
@@ -53,7 +53,7 @@
                 android:id="@+id/lv_detail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
-        </com.uas.pda_smart_com.view.CustomScrollView>
+        </uas.erp.jiaweisi_wms.view.CustomScrollView >
         <View
             android:layout_width="fill_parent"
             android:layout_height="0.5px"

app/src/main/res/layout/storagerechargetwo_fragment.xml

@@ -35,6 +35,8 @@
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/pda_wms_in_filter_list_srl"
         android:layout_width="match_parent"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
         android:layout_height="0dp"
         android:layout_weight="1">
 

app/src/main/res/xml/file_paths.xml

@@ -2,7 +2,7 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
 
    <!-- <external-path
-        path="Android/data/erp.erp.punaier_wms/"
+        path="Android/data/erp.erp.jiaweisi_wms/"
         name="files_root" />
     <external-path path="." name="external_storage_root" />-->
 

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 31,
             compileSdkVersion: 31,
             buildToolsVersion: "35.0.0",
-            versionCode      : 1,
-            versionName      : "1.0.0"
+            versionCode      : 2,
+            versionName      : "1.0.1"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/.gitignore

@@ -0,0 +1 @@
+/build