From 46e3e51a4c9f34afc84f54be6572175d37533e30 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 10 Feb 2023 22:02:37 +0800 Subject: [PATCH 1/7] =?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 --- .../java/org/nl/wms/pda/st/wql/PDA_CHECK.wql | 2 +- .../org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql | 55 ++++++++++++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql index c344e7ff6..e8b5b609d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql @@ -98,7 +98,7 @@ IF 输入.flag = "2" QUERY - SELECT + SELECT DISTINCT dtl.check_code, ( CASE diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql index 2374d99e8..5c5e7b25e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql @@ -17,6 +17,8 @@ 输入.pcsn TYPEAS s_string 输入.struct_id TYPEAS s_string 输入.iostorinv_id TYPEAS s_string + 输入.width TYPEAS s_string + 输入.thickness TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -121,4 +123,55 @@ ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + sub.width, + sub.thickness + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dis.box_no + WHERE + 1 = 1 + + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + + group by sub.width,sub.thickness + + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "6" + QUERY + SELECT + sub.package_box_sn AS box_no, + MAX( sub.product_description ) AS material_name, + SUM( sub.net_weight ) AS qty + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn + WHERE + 1 = 1 + + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + + OPTION 输入.width <> "" + sub.width = 输入.width + ENDOPTION + + OPTION 输入.thickness <> "" + sub.width = 输入.thickness + ENDOPTION + + group by sub.package_box_sn + + ENDSELECT + ENDQUERY + ENDIF From 16884fb76a74ae489f30ed3488350b89d98214ef Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sat, 11 Feb 2023 13:35:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql | 2 ++ .../src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql index a75255917..777be0ad5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql @@ -446,6 +446,8 @@ plan.qzzno = 输入.qzzno AND plan.is_delete = '0' + AND + plan.is_child_ps_ok = '0' OPTION 输入.product_area <> "" cut.product_area = 输入.product_area ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql index 3d04f186a..31939d23a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql @@ -60,14 +60,14 @@ ) AS task_status, class.class_name AS task_type, car_no, - create_time, + task.create_time, vehicle_code2, material_code FROM SCH_BASE_Task task LEFT JOIN md_pb_classstandard class ON class.class_code = task.task_type WHERE - is_delete = '0' + task.is_delete = '0' AND task_status <> '07' OPTION 输入.search <> "" From 933e61dd3cf55396360b53b9e1de8f1d6657be5c Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 11 Feb 2023 14:00:58 +0800 Subject: [PATCH 3/7] =?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 4/7] =?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 5/7] =?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