代码更新

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java

@@ -84,4 +84,11 @@ public class LmsToMesController {
     public ResponseEntity<Object> childRollFGOutboundComplete(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(lmsToMesService.childRollFGOutboundComplete(jo), HttpStatus.OK);
     }
+
+    @PostMapping("/LMSUnPackakge")
+    @Log("拆箱入库回传mes箱号、子卷号")
+    @ApiOperation("拆箱入库回传mes箱号、子卷号")
+    public ResponseEntity<Object> LmsSunPackage(@RequestBody JSONObject jo) {
+        return new ResponseEntity<>(lmsToMesService.LmsSunPackage(jo), HttpStatus.OK);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java

@@ -87,4 +87,15 @@ public interface LmsToMesService {
      */
     JSONObject childRollFGOutboundComplete(JSONObject param);
 
+    /**
+     * 拆箱入库：回传mes箱号、子卷号
+     * 参数:
+     * {
+     *     PackageBoxSN： 箱号
+     *     Details： [
+     *      {ContainerName: 子卷号}
+     *     ]
+     * }
+     */
+    JSONObject LmsSunPackage(JSONObject jo);
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java

@@ -466,6 +466,50 @@ public class LmsToMesServiceImpl implements LmsToMesService {
             }
 
 
+        } catch (Exception e) {
+            throw new BadRequestException("MES提示错误："+e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 拆箱入库：回传mes箱号、子卷号
+     *
+     * @return
+     */
+    @LokiLog(type = LokiLogType.LMS_TO_MES)
+    @Override
+    public JSONObject LmsSunPackage(JSONObject param) {
+        log.info("LMSUnPackakge接口输入参数为：-------------------" + param.toString());
+
+        JSONObject result = new JSONObject();
+        if (StrUtil.equals("0", is_connect_mes)) {
+            result.put("status", HttpStatus.OK.value());
+            result.put("message", "下发成功，但未连接MES!");
+            result.put("data", new JSONObject());
+            return result;
+        }
+
+        JSONArray list = new JSONArray();
+
+        // String url = acsUrl + api;
+        String url = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("MES_URL").getValue();
+        String api = "CamstarApi/LMSUnPackakge";
+        url = url + api;
+        try {
+            String resultMsg = HttpRequest.post(url)
+                    .body(String.valueOf(param))
+                    .execute().body();
+            result = JSONObject.parseObject(resultMsg);
+            log.info("LMSUnPackakge接口输出参数为：-------------------" + result.toString());
+
+
+            String RTYPE = result.getString("RTYPE");
+            if (RTYPE.equals("E")){
+                throw new BadRequestException(result.getString("RTMSG"));
+            }
+
+
         } catch (Exception e) {
             throw new BadRequestException("MES提示错误："+e.getMessage());
         }

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

@@ -96,7 +96,7 @@ public class PrintServiceImpl implements PrintService {
         //保质期
         String quality_guaran_period = box_jo.getString("quality_guaran_period");
         //检验员
-        String nspector = "";
+        String nspector = "1";
         //储存条件
         String storage_conditions = "";
 

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

@@ -160,7 +160,7 @@
             FROM
                 st_ivt_iostorinvdis dis
                 LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
-                LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_SN = dis.box_no AND sub.container_name = dis.pcsn
+                LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
                 LEFT JOIN sch_base_task task ON task.vehicle_code = dis.storagevehicle_code
             WHERE
                 mst.bill_type = '1005'

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql

@@ -374,6 +374,8 @@
                     OPTION 输入.bill_status <> ""
                           dis.work_status <= 输入.bill_status
                     ENDOPTION
+
+                    order by dis.struct_code ASC
                     ENDSELECT
                 ENDQUERY
         ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java

@@ -124,6 +124,26 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     }
                 }
 
+                // 拆分入库：回传mes
+                if (StrUtil.equals(bill_type, "0005")) {
+                    JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0);
+
+                    JSONObject param = new JSONObject();
+                    JSONArray details = new JSONArray();
+
+                    for (int j = 0; j < disArr.size(); j++) {
+                        JSONObject json = disArr.getJSONObject(j);
+                        param.put("PackageBoxSN", json.getString("box_no"));
+
+                        JSONObject jsonParamDtl = new JSONObject();
+                        jsonParamDtl.put("ContainerName", json.getString("pcsn"));
+
+                        details.add(jsonParamDtl);
+                    }
+                    param.put("Details", details);
+                    new LmsToMesServiceImpl().LmsSunPackage(param);
+                }
+
                 // 销售出库
                 if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) {
                     // 2.回传mes
@@ -580,7 +600,28 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 jo_mst.put("upload_time", DateUtil.now());
                 WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
             }
-            // 销售出库
+
+            // 拆分入库：回传mes
+            if (StrUtil.equals(bill_type, "0005")) {
+                JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0);
+
+                JSONObject param = new JSONObject();
+                JSONArray details = new JSONArray();
+
+                for (int j = 0; j < disArr.size(); j++) {
+                    JSONObject json = disArr.getJSONObject(j);
+                    param.put("PackageBoxSN", json.getString("box_no"));
+
+                    JSONObject jsonParamDtl = new JSONObject();
+                    jsonParamDtl.put("ContainerName", json.getString("pcsn"));
+
+                    details.add(jsonParamDtl);
+                }
+                param.put("Details", details);
+                new LmsToMesServiceImpl().LmsSunPackage(param);
+            }
+
+                // 销售出库
             if (StrUtil.equals(bill_type, "1001")) {
                 // 1.回传sap
                 JSONArray paramSapMstArr = new JSONArray();