From 9f8fb05cd00018885108ae6e824d13ee5bc01326 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Sat, 10 Dec 2022 14:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 706778953..cc7ecfe1d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -545,7 +545,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     jsonCool.put("io_type", "1");
                     jsonCool.put("material_id", mater_jo.getString("material_id"));
                     jsonCool.put("pcsn", parent_container_name);
-                    jsonCool.put("bill_status", "50");
+                    jsonCool.put("bill_status", "10");
                     jsonCool.put("task_id", task_id);
                     jsonCool.put("qty_unit_id", "1");
                     jsonCool.put("start_point_code", cool_ivt.getString("full_point_code"));
@@ -576,7 +576,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     if (ObjectUtil.isEmpty(struct)) {
                         throw new BadRequestException("该箱子已出库，不在库内！");
                     }
-                    if (!struct.getString("lock_type").equals("3")) {
+                    if (!struct.getString("lock_type").equals("1")) {
                         throw new BadRequestException("该木箱正在出库中！");
                     }
 
@@ -740,6 +740,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
         try {
             //        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
 //        if (StrUtil.equals(is_mesTolms, "1")) {
+            
             String isUnPlanProductionBox = param.getString("isUnPlanProductionBox"); // 是否计划外子卷
             String QuanlityInBox = param.getString("QuanlityInBox"); // 产品编码
             String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 保质期
@@ -820,8 +821,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 jo.put("width_standard",width_standard);
                 jo.put("thickness_request",thickness_request);
                 jo.put("status", "0");
-                jo.put("create_id", "2");
-                jo.put("create_name", "MES用户");
+                jo.put("create_id", "1");
+                jo.put("create_name", "管理员");
                 jo.put("create_time", DateUtil.now());
                 WQLObject tab = WQLObject.getWQLObject("PDM_BI_SubPackageRelation");
                 tab.insert(jo);