From f10d468c219aae7e741fd7f455ee7f0e8324c583 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 2 Jul 2024 14:00:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=AD=90=E5=8D=B7?= =?UTF-8?q?=E6=8C=89=E5=AD=90=E5=8D=B7=E8=A7=84=E6=A0=BC=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/PdmBiSubpackagerelationMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml index b92899986..3149a4777 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml @@ -84,7 +84,7 @@ WHERE b.point_status = '3' AND b.ivt_status = '3' AND a.sale_order_name = #{sale_order_name} - ORDER BY box_group DESC + ORDER BY paper_tube_description From 90572dc622b23edf2a36f9e8277d08c7baf13a20 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 2 Jul 2024 14:02:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?rev=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=8D=86?= =?UTF-8?q?=E6=89=8E=E7=9B=B8=E5=85=B3=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java | 9 +++++++++ .../main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java | 3 +++ .../iostorInv/util/impl/LashManageServiceImpl.java | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index bd9c8f11d..66a9ad816 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -106,10 +106,19 @@ public class TwoLashTask extends AbstractAcsTask { interaction_json.put("weight", dao.get(0).getBox_width()); interaction_json.put("height", dao.get(0).getBox_high()); // 捆扎模版 + if (ObjectUtil.isEmpty(boxTypeDao.getLash_num())) { + throw new BadRequestException("捆扎模版不能为空!"); + } interaction_json.put("template", boxTypeDao.getLash_num()); // 第二次捆扎次数 + if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_tow())) { + throw new BadRequestException("第二次捆扎数不能为空!"); + } interaction_json.put("bindingTimes", boxTypeDao.getLash_num_tow()); // 是否二次捆扎 + if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_two())) { + throw new BadRequestException("是否第二次捆扎不能为空!"); + } interaction_json.put("isBinding", boxTypeDao.getNeed_lash_two()); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java index 065a7faa8..3832da6d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java @@ -84,6 +84,9 @@ public class TwoSendOutTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(boxTypeDao)) { throw new BadRequestException("木箱类型信息不存在!木箱料号为："+boxDao.getMaterial_code()); } + if (ObjectUtil.isEmpty(boxTypeDao.getExpend_width())) { + throw new BadRequestException("货叉放货宽度不能为空!"); + } param.put("expandWidthLength",boxTypeDao.getExpend_width()); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index 94d100b38..9b20d7b71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -275,18 +275,27 @@ public class LashManageServiceImpl implements LashManageService { result.put("height", boxDao.getBox_high()); result.put("case", boxDao.getMaterial_code()); // 是否捆扎 + if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_one())) { + throw new BadRequestException("第一次是否捆扎不能为空!"); + } result.put("isBinding", boxTypeDao.getNeed_lash_one()); // TODO 是否贴标 result.put("isLabeling", IOSEnum.IS_SEND.code("否")); // TODO 贴标模版 result.put("labelingTemplate", boxDao.getLash_num()); // 捆扎模板 + if (ObjectUtil.isEmpty(boxTypeDao.getLash_num())) { + throw new BadRequestException("捆扎模版不能为空!"); + } result.put("bindingTemplate", boxTypeDao.getLash_num()); // TODO 打印机 result.put("printDevice", "1"); // TODO 贴标数量 result.put("printQty", "1"); // 第一次捆扎次数 + if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_one())) { + throw new BadRequestException("第一次捆扎数量不能为空!"); + } result.put("bundleTimes", boxTypeDao.getLash_num_one()); return result; From 2de875acd01deb6399f2ba07342dbbc8c9af1b4d Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 2 Jul 2024 14:03:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?rev=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=8D=86?= =?UTF-8?q?=E6=89=8E=E7=9B=B8=E5=85=B3=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index 66a9ad816..792928ff0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -114,6 +114,7 @@ public class TwoLashTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_tow())) { throw new BadRequestException("第二次捆扎数不能为空!"); } + interaction_json.put("bindingTimes", boxTypeDao.getLash_num_tow()); // 是否二次捆扎 if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_two())) {