蓝牙打印调整，部分优化

app/src/main/java/com/uas/uas_mes_standard/bean/PrintListBean.java

@@ -0,0 +1,20 @@
+package com.uas.uas_mes_standard.bean;
+
+/**
+ * Created by cjh-sail on 2023-04-17
+ */
+public class PrintListBean {
+    private String bar_code;
+
+    public PrintListBean(String bar_code) {
+        this.bar_code = bar_code;
+    }
+    public PrintListBean(){}
+    public String getBar_code() {
+        return bar_code;
+    }
+
+    public void setBar_code(String bar_code) {
+        this.bar_code = bar_code;
+    }
+}

app/src/main/java/com/uas/uas_mes_standard/bean/WHBreakingBatchBreakingBtnClickEvent.java

@@ -38,15 +38,33 @@ public class WHBreakingBatchBreakingBtnClickEvent {
          * BAR_ID : 12
          */
 
-        private double BAR_REMAIN;
+        private String BAR_REMAIN;
         private String BAR_CODE;
-        private int BAR_ID;
+        private String BAR_ID;
+        private String PR_SPEC;
+        private String PR_CODE;
 
-        public double getBAR_REMAIN() {
+        public String getPR_SPEC() {
+            return PR_SPEC;
+        }
+
+        public void setPR_SPEC(String PR_SPEC) {
+            this.PR_SPEC = PR_SPEC;
+        }
+
+        public String getPR_CODE() {
+            return PR_CODE;
+        }
+
+        public void setPR_CODE(String PR_CODE) {
+            this.PR_CODE = PR_CODE;
+        }
+
+        public String getBAR_REMAIN() {
             return BAR_REMAIN;
         }
 
-        public void setBAR_REMAIN(double BAR_REMAIN) {
+        public void setBAR_REMAIN(String BAR_REMAIN) {
             this.BAR_REMAIN = BAR_REMAIN;
         }
 
@@ -58,11 +76,11 @@ public class WHBreakingBatchBreakingBtnClickEvent {
             this.BAR_CODE = BAR_CODE;
         }
 
-        public int getBAR_ID() {
+        public String getBAR_ID() {
             return BAR_ID;
         }
 
-        public void setBAR_ID(int BAR_ID) {
+        public void setBAR_ID(String BAR_ID) {
             this.BAR_ID = BAR_ID;
         }
     }

app/src/main/java/com/uas/uas_mes_standard/fragment/BlueToothPrintFragment.java

@@ -340,7 +340,9 @@ public class BlueToothPrintFragment extends BaseFragment {
         if (!ListUtils.isEmpty(models)) {
             for (int i = 0; i < models.size(); i++) {
                 BluetoothDevice bluetoothDevice = models.get(i);
-                if (bluetoothDevice != null&&bluetoothDevice.getName().startsWith("HM")) {//&& bluetoothDevice.getBluetoothClass().getDeviceClass() == ConnectHelper.PRINT_TYPE
+                if (bluetoothDevice != null
+//                        &&bluetoothDevice.getName().startsWith("HM")
+                ) {//&& bluetoothDevice.getBluetoothClass().getDeviceClass() == ConnectHelper.PRINT_TYPE
                     printDevices.add(bluetoothDevice);
                 }
             }

app/src/main/java/com/uas/uas_mes_standard/fragment/IOCOutMakeMaterialOper.java

@@ -103,7 +103,7 @@ import okhttp3.OkHttpClient;
  * Created by RaoMeng on 2016/7/27.
  * 材料出库采集页面
  */
-public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener, HttpCallback {
+public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener,  HttpCallback {
     private static final int SCAN_BARCODE_CODE = 103;
     private static final int SPLIT_BARCODE_SUCCESS = 104;
     private static final int SPLIT_BARCODE_FAIL = 105;
@@ -255,7 +255,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     }
 
                                     //弹出拆分结果弹框
-                                    initBreakPopupWindow(listArray);
+                                    initBreakPopupWindow(listArray,"1");
                                 }
 
                                 mCollectResultTextView.setText(barcodeResult);
@@ -422,6 +422,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private CheckBox special_check;
     private TextView text_finishno;
 
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_iocout_make_material_oper;
@@ -455,7 +456,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         special_check = root.findViewById(R.id.special_check);
 
         text_finishno = root.findViewById(R.id.text_finishno);
-
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.out_material_collect));
 //        ((FunctionActivity) getActivity()).fragment = new IOCOutMakeMaterialOper();
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
@@ -541,6 +541,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
     @Override
     protected void initEvents() {
+
         btnActionbarRight.setOnClickListener(this);
         etBarCode.addTextChangedListener(watcher);
         mCollectTypeRadioGroup.setOnCheckedChangeListener(this);
@@ -818,6 +819,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         CommonUtil.toastNoRepeat(mActivity, "采集结果获取失败！");
                         return;
                     }
+                    etBarCode.setText(null);
+
                     JSONObject messageObject = dataObject.getJSONObject("barcode");
 
                     if (messageObject.has("IFOVER") && messageObject.optBoolean("IFOVER")) {
@@ -1647,7 +1650,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 //                                }
 
                                 //弹出拆分结果弹框
-                                initBreakPopupWindow(listArray);
+                                initBreakPopupWindow(listArray,"1");
                             }
                             String finishno = JsonUtils.optStringNotNull(dataObject, "finishno");
                             if (!finishno.isEmpty()){
@@ -2022,7 +2025,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         PdaApplication.mRequestQueue.add(stringRequest);*/
     }
 
-    protected void initBreakPopupWindow(JSONArray listArray) {
+    protected void initBreakPopupWindow(JSONArray listArray,String bolle) {
         messages.clear();
         for (int i = 0; i < listArray.length(); i++) {
             try {
@@ -2030,9 +2033,15 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                 if (barcodeObject != null) {
                     WHBreakingBatchBreakingBtnClickEvent.DataBean dataBean = new WHBreakingBatchBreakingBtnClickEvent.DataBean();
-
-                    dataBean.setBAR_CODE(JsonUtils.optStringNotNull(barcodeObject, "BAR_CODE"));
-                    dataBean.setBAR_REMAIN(JsonUtils.optDoubleNotNull(barcodeObject, "BAR_REMAIN"));
+                    if (bolle.equals("true")){
+                        dataBean.setBAR_CODE(JsonUtils.optStringNotNull(barcodeObject, "BAR_CODE"));
+                        dataBean.setBAR_REMAIN(JsonUtils.optStringNotNull(barcodeObject, "BAR_REMAIN"));
+                        dataBean.setPR_CODE(JsonUtils.optStringNotNull(barcodeObject, "PR_CODE"));
+                        dataBean.setPR_SPEC(JsonUtils.optStringNotNull(barcodeObject, "PR_SPEC"));
+                    }else {
+                        dataBean.setBAR_CODE(JsonUtils.optStringNotNull(barcodeObject, "BAR_CODE"));
+                        dataBean.setBAR_REMAIN(JsonUtils.optStringNotNull(barcodeObject, "BAR_REMAIN"));
+                    }
 
                     messages.add(dataBean);
                 }
@@ -2215,7 +2224,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             // tv_bar_code.setText(target.bar_code);
             // tv_bar_remain.setText(target.bar_remain);
             tv_bar_code.setText(person.getBAR_CODE());
-            tv_bar_remain.setText(CommonUtil.doubleFormat(person.getBAR_REMAIN()));
+            tv_bar_remain.setText(person.getBAR_REMAIN());
             return convertView;
         }
 
@@ -2635,6 +2644,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         }
     }
 
+
+
+
+
+
     /**
      * 清除所有信息
      */

app/src/main/java/com/uas/uas_mes_standard/fragment/SpecialMaterialOutFragment.java

@@ -659,7 +659,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
                     WHBreakingBatchBreakingBtnClickEvent.DataBean dataBean = new WHBreakingBatchBreakingBtnClickEvent.DataBean();
 
                     dataBean.setBAR_CODE(JsonUtils.optStringNotNull(barcodeObject, "BAR_CODE"));
-                    dataBean.setBAR_REMAIN(JsonUtils.optDoubleNotNull(barcodeObject, "BAR_REMAIN"));
+                    dataBean.setBAR_REMAIN(JsonUtils.optStringNotNull(barcodeObject, "BAR_REMAIN"));
 
                     messages.add(dataBean);
                 }
@@ -903,7 +903,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
             TextView tv_bar_code = (TextView) convertView.findViewById(R.id.tv_bar_code);
             TextView tv_bar_remain = (TextView) convertView.findViewById(R.id.tv_bar_remain);
             tv_bar_code.setText(person.getBAR_CODE());
-            tv_bar_remain.setText(CommonUtil.doubleFormat(person.getBAR_REMAIN()));
+            tv_bar_remain.setText(person.getBAR_REMAIN());
             return convertView;
         }
     }

app/src/main/java/com/uas/uas_mes_standard/fragment/WHBreakingBatchFragment.java

@@ -506,7 +506,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
             case R.id.btn_back:
                 closePopupWindow();
                 if (messages != null && messages.size() > 0) {
-                    tvOrRemain.setText(CommonUtil.doubleFormat(messages.get(0).getBAR_REMAIN()));
+                    tvOrRemain.setText(messages.get(0).getBAR_REMAIN());
                     CommonUtil.editTextGetFocus(etBarRemain);
                 }
                 break;
@@ -792,7 +792,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
             // tv_bar_code.setText(target.bar_code);
             // tv_bar_remain.setText(target.bar_remain);
             tv_bar_code.setText(person.getBAR_CODE());
-            tv_bar_remain.setText(CommonUtil.doubleFormat(person.getBAR_REMAIN()));
+            tv_bar_remain.setText(person.getBAR_REMAIN());
             return convertView;
         }
     }

app/src/main/java/com/uas/uas_mes_standard/global/GloableParams.java

@@ -266,7 +266,7 @@ public class GloableParams {
 
     public static String ADDRESS_INVENTORYBINDING;
     public static String ADDRESS_INVENTORYBINDING2;
-
+    public static String ADDRESS_ADDRESSTAIL_PRINTSUMLABEL;
 
 
     //连接服务器请求地址
@@ -752,7 +752,7 @@ public class GloableParams {
     //库存条码绑定
     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 String ADDRESSTAIL_GET_PRINTSUMLABEL="/api/pda/outMaterial/printSumLabel.action";
 
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
@@ -1193,5 +1193,7 @@ public class GloableParams {
         GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT;
         GloableParams.ADDRESS_INVENTORYBINDING= uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
         GloableParams.ADDRESS_INVENTORYBINDING2= uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
+        GloableParams.ADDRESS_ADDRESSTAIL_PRINTSUMLABEL= uriHead + GloableParams.ADDRESSTAIL_GET_PRINTSUMLABEL;
+
     }
 }

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

@@ -1,7 +1,8 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="com.uas.uas_mes_standard.fragment.IOCOutMakeMaterialOper">
     <!--    <include
             android:id="@+id/include_menuactionbar"
@@ -9,7 +10,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:orientation="vertical">
         <!--no use-->
         <LinearLayout
@@ -117,7 +119,6 @@
                         android:text="特殊出库">
                     </CheckBox>
 
-
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -179,7 +180,7 @@
                     </TableRow>
 
                 </TableLayout>
-                 <!--no use-->
+                <!--no use-->
                 <Button
                     android:id="@+id/btn_confirm"
                     style="@style/ButtonStyle"
@@ -346,6 +347,7 @@
                     android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
                     tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
+
                 <TextView
                     android:visibility="gone"
                     android:id="@+id/text_finishno"
@@ -355,10 +357,9 @@
                     android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
                     tools:text="" />
-
             </LinearLayout>
 
         </ScrollView>
     </LinearLayout>
 
-</RelativeLayout>
+</LinearLayout>

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 14,
-            versionName      : "v1.4"
+            versionCode      : 10,
+            versionName      : "v1.0"
     ]
 
     depsVersion = [