diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 30cc5b01c..d30ace62a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -202,20 +202,20 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl 待检区,木箱码不能为空!"); -// } -// //更新子卷包装关系更新木箱号 -// UpdateWrapper updateWrapper1 = new UpdateWrapper<>(); -// updateWrapper1.set("package_box_sn", boxSn); -// updateWrapper1.in("workorder_id", entityList); -// pdmBiSubpackagerelationMapper.update(null, updateWrapper1); + JSONObject boxInfo = new JSONObject(); + //todo 测试,暂时默认ZXQ_1_1 + boxInfo.put("device_code", "ZXQ_1_1"); + boxInfo.put("material_code", boxType); + boxInfo.put("num", entityList.size()); + String boxSn = outBoxManageService.outBox(boxInfo); + if (StringUtils.isBlank(boxSn)) { + throw new BadRequestException("满轴缓存位 -> 待检区,木箱码不能为空!"); + } + //更新子卷包装关系更新木箱号 + UpdateWrapper updateWrapper1 = new UpdateWrapper<>(); + updateWrapper1.set("package_box_sn", boxSn); + updateWrapper1.in("workorder_id", entityList); + pdmBiSubpackagerelationMapper.update(null, updateWrapper1); transferToPacking(packagerelationList); } catch (Exception e) { throw new BadRequestException(e.getMessage()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index f5c211ec7..4067a94d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -111,7 +111,7 @@ public abstract class AbstractAcsTask { List taskList = this.schedule(); if (ObjectUtil.isNotEmpty(taskList)) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - //return AcsUtil.notifyAcs("api/wms/task", arr); + return AcsUtil.notifyAcs("api/wms/task", arr); } return null; }