修复出库单没显示本地数据问题,增加解除报警以及其他首页添加光标定位,修改条码信息核查--仓库名称为出库单,根据行之成文档添加功能内容.根据行之成文档, 增加实物点亮功能, 增加料架物料核查功能,修改接口报错异常信息为300个字符 ,增加点亮空库位功能, 料架物料核查增加库位列表, 固定宽度, 接口错误修改提示为前300个字符, 联调条码拆分的功能.修改电亮空库位料架清空逻辑, 修复错误提示长度不足300字符问题, 添加远程Log日志集成

app/src/main/java/com/uas/xzc_electronic/adapter/StockTaskMultipleAdapter.java

@@ -63,7 +63,7 @@ public class StockTaskMultipleAdapter extends BaseAdapter {
     private void initializeViews(StockTaskMultipleBean object, final ViewHolder holder) {
         holder.stockTaskMultipleOrispeccode.setText(object.getPR_ORISPECCODE());
         holder.stockTaskMultipleProdcode.setText(object.getPD_PRODCODE());
-        holder.stockTaskMultipleWaitNum.setText(CommonUtil.doubleFormat(object.getPD_RESTQTY()));
+        holder.stockTaskMultipleWaitNum.setText(object.getPD_RESTQTY());
         holder.stockTaskMultipleSum.setText(CommonUtil.doubleFormat(object.getPD_OUTQTY()));
         holder.stockTaskMultipleZxbzs.setText(CommonUtil.doubleFormat(object.getBAR_REMAIN()));
         holder.stockTaskMultipleBatchcode.setText(object.getPD_BATCHCODE());

app/src/main/java/com/uas/xzc_electronic/bean/StockTaskMultipleBean.java

@@ -26,7 +26,7 @@ public class StockTaskMultipleBean {
     private String PR_DETAIL;
     private String PR_SPEC;
     private double PD_OUTQTY;
-    private double PD_RESTQTY;
+    private String PD_RESTQTY;
     private double PR_ZXBZS;
     private String BAR_LOCATION;
     private String PD_BATCHCODE;
@@ -93,11 +93,11 @@ public class StockTaskMultipleBean {
         this.PD_OUTQTY = PD_OUTQTY;
     }
 
-    public double getPD_RESTQTY() {
+    public String getPD_RESTQTY() {
         return PD_RESTQTY;
     }
 
-    public void setPD_RESTQTY(double PD_RESTQTY) {
+    public void setPD_RESTQTY(String PD_RESTQTY) {
         this.PD_RESTQTY = PD_RESTQTY;
     }
 

app/src/main/java/com/uas/xzc_electronic/fragment/MaterialOutStockTaskMultipleFragment.java

@@ -209,7 +209,7 @@ public class MaterialOutStockTaskMultipleFragment extends BaseFragment {
                                         stockTaskItemBean.setPR_DETAIL(JsonUtils.optStringNotNull(dataObject, "PR_DETAIL"));
                                         stockTaskItemBean.setPR_SPEC(JsonUtils.optStringNotNull(dataObject, "PR_SPEC"));
                                         stockTaskItemBean.setPD_OUTQTY(JsonUtils.optDoubleNotNull(dataObject, "PD_OUTQTY"));
-                                        stockTaskItemBean.setPD_RESTQTY(JsonUtils.optDoubleNotNull(dataObject, "PD_RESTQTY"));
+                                        stockTaskItemBean.setPD_RESTQTY(JsonUtils.optStringNotNull(dataObject, "PD_RESTQTY"));
                                         stockTaskItemBean.setPR_ZXBZS(JsonUtils.optDoubleNotNull(dataObject, "PR_ZXBZS"));
                                         stockTaskItemBean.setBAR_LOCATION(JsonUtils.optStringNotNull(dataObject, "BAR_LOCATION"));
                                         stockTaskItemBean.setBA_HASBARCODE((int) JsonUtils.optLongNotNull(dataObject, "BA_HASBARCODE"));

app/src/main/java/com/uas/xzc_electronic/fragment/StockDataSummaryFragment.java

@@ -40,8 +40,8 @@ import java.util.List;
  */
 public class StockDataSummaryFragment extends BaseFragment implements OnColumnItemClickListener<String> {
     private SmartTable mSmartTable;
-    private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
-    private Column<Double> mPdaqtyColumn, mDetailColumn;
+    private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn,mDetailColumn;
+    private Column<Double> mPdaqtyColumn;
     private TableData<StockTaskMultipleBean> mTableData;
     private TextView mNumTextView;
     private CheckBox mCheckBox;
@@ -77,16 +77,7 @@ public class StockDataSummaryFragment extends BaseFragment implements OnColumnIt
                 return CommonUtil.doubleFormat(aDouble);
             }
         });
-        mDetailColumn = new Column<Double>("已采集数量", "PD_RESTQTY", new IFormat<Double>() {
-            @Override
-            public String format(Double aDouble) {
-                return CommonUtil.doubleFormat(aDouble);
-            }
-        });
-
-
-
-
+        mDetailColumn = new Column<String>("已采集数量", "PD_RESTQTY");
     }
 
     @Override
@@ -148,7 +139,7 @@ public class StockDataSummaryFragment extends BaseFragment implements OnColumnIt
                                 stockTaskMultipleBean.setPD_PRODCODE(FastjsonUtil.getText(dataObject, "PD_PRODCODE"));
                                 stockTaskMultipleBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
                                 stockTaskMultipleBean.setPD_OUTQTY(FastjsonUtil.getDouble(dataObject, "PD_OUTQTY"));
-                                stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getDouble(dataObject, "PD_PDAQTY"));
+                                stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getText(dataObject, "PD_PDAQTY"));
                                 //新增型号
                                 stockTaskMultipleBean.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
 

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 22,
-            versionName      : "v1.1.1"
+            versionCode      : 23,
+            versionName      : "v1.1.2"
     ]
 
     depsVersion = [