代码更新

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java

@@ -55,9 +55,13 @@ public class PdaCheckServiceImpl implements PdaCheckService {
 
     @Override
     public JSONObject checkQueryDtl(JSONObject whereJson) {
+        String box_no = whereJson.getString("box_no");
+
         JSONObject map = new JSONObject();
         map.put("flag", "2");
         map.put("check_code", whereJson.getString("check_code"));
+        if (ObjectUtil.isNotEmpty(box_no)) map.put("storagevehicle_code","%"+box_no+"%");
+
         JSONArray resultJSONArray = WQL.getWO("PDA_CHECK").addParamMap(map).process().getResultJSONArray(0);
 
         JSONObject jo = new JSONObject();

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql

@@ -116,8 +116,8 @@
             	dtl.storagevehicle_code,
             	mater.material_code,
             	mater.material_name,
-                ROUND(dtl.base_qty)	AS base_qty,
+                ROUND(dtl.base_qty,3) AS net_qty,
-                ROUND(dtl.fac_qty)	AS fac_qty,
+                ROUND(dtl.fac_qty,3) AS fac_qty,
             	dtl.qty_unit_name,
             	(
             	    CASE
@@ -142,6 +142,10 @@
                     dtl.check_code = 输入.check_code
                 ENDOPTION
 
+                OPTION 输入.storagevehicle_code <> ""
+                    dtl.storagevehicle_code like 输入.storagevehicle_code
+                ENDOPTION
+
 			ENDSELECT
 		ENDQUERY
 	ENDIF
@@ -186,3 +190,20 @@
 			ENDSELECT
 		ENDQUERY
 	ENDIF
+
+	IF 输入.flag = "4"
+		QUERY
+            SELECT
+                SUM(net_weight) AS net_weight
+            FROM
+                pdm_bi_subpackagerelation
+            WHERE
+                1=1
+
+                OPTION 输入.storagevehicle_code <> ""
+                    package_box_sn = 输入.storagevehicle_code
+                ENDOPTION
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java

@@ -187,6 +187,9 @@ public class CheckServiceImpl implements CheckService {
             jsonDtl.put("qty_unit_id", json.getLongValue("measure_unit_id"));
             jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
             jsonDtl.put("status", "1");
+
+            JSONObject jsonSub = WQL.getWO("PDA_CHECK").addParam("flag", "4").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().uniqueResult(0);
+            jsonDtl.put("base_qty", jsonSub.getDoubleValue("net_weight"));
             dtlTab.insert(jsonDtl);
         }
     }
@@ -286,6 +289,9 @@ public class CheckServiceImpl implements CheckService {
             jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
             jsonDtl.put("status", "1");
             jsonDtl.put("fac_qty", json.getDoubleValue("fac_qty"));
+
+            JSONObject jsonSub = WQL.getWO("PDA_CHECK").addParam("flag", "4").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().uniqueResult(0);
+            jsonDtl.put("base_qty", jsonSub.getDoubleValue("net_weight"));
             dtlTab.insert(jsonDtl);
         }
     }

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql

@@ -341,7 +341,7 @@
                             	CheckDtl.storagevehicle_id,
                             	CheckDtl.storagevehicle_code,
                             	CheckDtl.material_id,
-                            	CheckDtl.base_qty,
+                            	ROUND(CheckDtl.base_qty,3) AS base_qty,
                             	CheckDtl.qty_unit_id,
                             	CheckDtl.qty_unit_name,
                             	CheckDtl.STATUS,

lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue

@@ -108,6 +108,7 @@
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
       <el-table-column prop="material_name" show-overflow-tooltip label="物料名称" align="center" width="170px" />
       <el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" width="110px" />
+      <el-table-column prop="base_qty" label="净重" align="center" width="110px" />
       <el-table-column show-overflow-tooltip prop="check_result" label="是否异常" align="center" width="210px">
         <template scope="scope">
           <el-select