Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

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

@@ -308,8 +308,11 @@ public class ProductInstorServiceImpl implements ProductInstorService {
         String to_strap_times = ""; // 捆扎次数
         String to_command  = "4"; // 指令
 
+        String bundle_times_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("bundle_times_num").getValue();
+        Double box_bundle_times_num = Double.valueOf(bundle_times_num);
         Double box_length_value = Double.valueOf(to_length);
-        if (box_length_value >= 772) {
+
+        if (box_length_value >= box_bundle_times_num) {
             to_strap_times = "3";
         } else {
             to_strap_times = "2";

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

@@ -70,7 +70,7 @@
             	PDM_BI_SubPackageRelation sub
             	LEFT JOIN sch_base_point point ON sub.package_box_SN = point.vehicle_code
             WHERE
-                1=1
+                point.point_type = '9'
 
                 OPTION 输入.box_no <> ""
                     point.vehicle_code = 输入.box_no

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

@@ -3,6 +3,7 @@ package org.nl.wms.st.instor.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -42,6 +43,9 @@ public class CheckServiceImpl implements CheckService {
 
     @Override
     public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
+
+        WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_checkdtl");
+
         HashMap<String, String> map = new HashMap<>(whereJson);
         map.put("flag", "1");
         if (StrUtil.isNotEmpty(map.get("check_code"))) {
@@ -58,6 +62,22 @@ public class CheckServiceImpl implements CheckService {
         if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id);
 
         JSONObject jo = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "check_code desc");
+        JSONArray content = jo.getJSONArray("content");
+
+        for (int i = 0; i < content.size(); i++) {
+            int pcsn_num = 0;
+
+            JSONObject jsonObject = content.getJSONObject(i);
+            JSONArray dtlArr = dtlTab.query("check_id = '" + jsonObject.getString("check_id") + "'").getResultJSONArray(0);
+
+            for (int j = 0; j < dtlArr.size(); j++) {
+                JSONObject json = dtlArr.getJSONObject(j);
+
+                JSONArray boxNum = WQL.getWO("QST_IVT_CHECK").addParam("flag", "12").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().getResultJSONArray(0);
+                pcsn_num += boxNum.size();
+            }
+            jsonObject.put("pcsn_num",pcsn_num);
+        }
         return jo;
     }
 
@@ -678,9 +698,16 @@ public class CheckServiceImpl implements CheckService {
 
     @Override
     public void download(JSONArray rows, HttpServletResponse response) throws IOException {
+        WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
+
         List<Map<String, Object>> list = new ArrayList<>();
         for (int i = 0; i < rows.size(); i++) {
             JSONObject jo = rows.getJSONObject(i);
+
+            String storagevehicle_code = jo.getString("storagevehicle_code");
+            JSONObject jsonSub = subTab.query("package_box_sn = '" + storagevehicle_code + "'").uniqueResult(0);
+//            if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此木箱没有子卷包装关系："+storagevehicle_code);
+
             Map<String, Object> map = new LinkedHashMap<>();
             String status = jo.getString("status");
             if (StrUtil.equals(status, "1")) {
@@ -702,7 +729,20 @@ public class CheckServiceImpl implements CheckService {
             map.put("净重", jo.getString("base_qty"));
             map.put("物料编码", jo.getString("material_code"));
             map.put("物料名称", jo.getString("material_name"));
-            map.put("备注", jo.getString("remark"));
+
+            if (ObjectUtil.isEmpty(jsonSub)) {
+                map.put("厚度", "");
+                map.put("幅宽", "");
+                map.put("标准厚度", "");
+                map.put("客户要求幅宽", "");
+                map.put("备注", "");
+            } else {
+                map.put("厚度", jsonSub.getString("thickness"));
+                map.put("幅宽", jsonSub.getString("width"));
+                map.put("标准厚度", jsonSub.getString("thickness_request"));
+                map.put("客户要求幅宽", jsonSub.getString("width_standard"));
+                map.put("备注", jo.getString("remark"));
+            }
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);

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

@@ -513,3 +513,21 @@
 			ENDSELECT
 		ENDQUERY
 	ENDIF
+
+	IF 输入.flag = "12"
+		QUERY
+			SELECT
+            	*
+            FROM
+            	st_ivt_structivt ivt
+            	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn
+            WHERE
+                1 = 1
+
+               OPTION 输入.storagevehicle_code <> ""
+                       sub.package_box_sn = 输入.storagevehicle_code
+               ENDOPTION
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -4079,6 +4079,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 dis_row.put("struct_name", "");
                 dis_row.put("work_status", "00");
                 dis_row.put("real_qty", "0");
+                dis_row.put("point_id", "");
+                dis_row.put("task_id", "");
                 //插入分配表
                 dis_wql.insert(dis_row);
 

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="盘点单新增"
+    title="盘点单明细"
     append-to-body
     fullscreen
     :before-close="crud.cancelCU"

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

@@ -181,7 +181,8 @@
         <el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="150" label="业务类型" />
         <el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="150" label="盘点状态" />
         <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="150" />
-        <el-table-column label="明细数" align="center" prop="dtl_num" width="150" />
+        <el-table-column label="箱数" align="center" prop="dtl_num" width="150" />
+        <el-table-column label="子卷数" align="center" prop="pcsn_num" width="150" />
         <el-table-column show-overflow-tooltip prop="input_time" width="170" label="创建日期" />
       </el-table>
       <!--分页组件-->