From 933e61dd3cf55396360b53b9e1de8f1d6657be5c Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 11 Feb 2023 14:00:58 +0800 Subject: [PATCH 1/6] =?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 --- .../impl/InAndOutRetrunServiceImpl.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 9156a1ae4..9b1daba43 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -456,6 +456,16 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 1.回传sap JSONArray paramSapMstArr = new JSONArray(); + String estimated_freight = jo_mst.getString("estimated_freight"); + String trans_code = jo_mst.getString("trans_code"); + + if (ObjectUtil.isEmpty(estimated_freight)) { + throw new BadRequestException("运费不能为空"); + } + if (ObjectUtil.isEmpty(trans_code)) { + throw new BadRequestException("物流公司不能为空"); + } + JSONObject paramSapMst = new JSONObject(); paramSapMst.put("ZACTION", "P"); paramSapMst.put("BUDAT", jo_mst.getString("biz_date")); @@ -921,6 +931,16 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 1.回传sap JSONArray paramSapMstArr = new JSONArray(); + String estimated_freight = jo_mst.getString("estimated_freight"); + String trans_code = jo_mst.getString("trans_code"); + + if (ObjectUtil.isEmpty(estimated_freight)) { + throw new BadRequestException("运费不能为空"); + } + if (ObjectUtil.isEmpty(trans_code)) { + throw new BadRequestException("物流公司不能为空"); + } + JSONObject paramSapMst = new JSONObject(); paramSapMst.put("ZACTION", "P"); paramSapMst.put("BUDAT", jo_mst.getString("biz_date")); From 8544b03a40d02b2760e5a46351176eeb4a90f66d Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 11 Feb 2023 14:29:58 +0800 Subject: [PATCH 2/6] =?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 --- .../service/impl/CheckOutBillServiceImpl.java | 33 +++++++++++++++++++ .../impl/InAndOutRetrunServiceImpl.java | 20 ----------- .../views/wms/st/inStor/change/AddDialog.vue | 2 +- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 638cea79e..63fcfd747 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -787,6 +787,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { throw new BadRequestException("查不到出库单信息"); } + // 如果是发货出库则判断运费和物流公司不能为空 + String bill_type = jo_mst.getString("bill_type"); + if (StrUtil.equals(bill_type, "1001")) { + String trans_code = jo_mst.getString("trans_code"); + String estimated_freight = jo_mst.getString("estimated_freight"); + + if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空"); + if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空"); + + } + //查询生成和未分配完的明细 JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") .addParam("flag", "2") @@ -1010,6 +1021,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { throw new BadRequestException("查不到出库单信息"); } + // 如果是发货出库则判断运费和物流公司不能为空 + String bill_type = jo_mst.getString("bill_type"); + if (StrUtil.equals(bill_type, "1001")) { + String trans_code = jo_mst.getString("trans_code"); + String estimated_freight = jo_mst.getString("estimated_freight"); + + if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空"); + if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空"); + + } + //查询生成和未分配完的明细 JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") .addParam("flag", "2") @@ -3659,6 +3681,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { throw new BadRequestException("当前订单无可分配出库明细"); } + // 如果是发货出库则判断运费和物流公司不能为空 + String bill_type = jo_mst.getString("bill_type"); + if (StrUtil.equals(bill_type, "1001")) { + String trans_code = jo_mst.getString("trans_code"); + String estimated_freight = jo_mst.getString("estimated_freight"); + + if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空"); + if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空"); + + } + //查询生成和未分配完的明细 JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL") .addParam("flag", "2") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 9b1daba43..9156a1ae4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -456,16 +456,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 1.回传sap JSONArray paramSapMstArr = new JSONArray(); - String estimated_freight = jo_mst.getString("estimated_freight"); - String trans_code = jo_mst.getString("trans_code"); - - if (ObjectUtil.isEmpty(estimated_freight)) { - throw new BadRequestException("运费不能为空"); - } - if (ObjectUtil.isEmpty(trans_code)) { - throw new BadRequestException("物流公司不能为空"); - } - JSONObject paramSapMst = new JSONObject(); paramSapMst.put("ZACTION", "P"); paramSapMst.put("BUDAT", jo_mst.getString("biz_date")); @@ -931,16 +921,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 1.回传sap JSONArray paramSapMstArr = new JSONArray(); - String estimated_freight = jo_mst.getString("estimated_freight"); - String trans_code = jo_mst.getString("trans_code"); - - if (ObjectUtil.isEmpty(estimated_freight)) { - throw new BadRequestException("运费不能为空"); - } - if (ObjectUtil.isEmpty(trans_code)) { - throw new BadRequestException("物流公司不能为空"); - } - JSONObject paramSapMst = new JSONObject(); paramSapMst.put("ZACTION", "P"); paramSapMst.put("BUDAT", jo_mst.getString("biz_date")); diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue index de4fb0fbd..9af753984 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue @@ -130,7 +130,7 @@ - + From b16d022b80a7b4839f9fc5c29b93af11fcdc3dc4 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sat, 11 Feb 2023 15:04:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml index 7787999ee..7b56cda04 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml @@ -67,7 +67,7 @@ sys_roles_menus WHERE role_id IN ( SELECT role_id FROM sys_users_roles where user_id = #{user}) - ) + ) order by menu_sort