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 26a291aeb..7a7806550 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 @@ -82,6 +82,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (StrUtil.isNotEmpty(map.get("vbeln"))) { map.put("vbeln", "%" + map.get("vbeln") + "%"); } + if (StrUtil.isNotEmpty(map.get("pcsn"))) { + map.put("pcsn", "%" + map.get("pcsn") + "%"); + } + if (StrUtil.isNotEmpty(map.get("sap_pcsn"))) { + map.put("sap_pcsn", "%" + map.get("sap_pcsn") + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index 4b8a8cc3a..d038bfa7a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -82,6 +82,8 @@ ST_IVT_IOStorInv ios LEFT JOIN md_cs_customerbase cu ON ios.cust_code = cu.cust_code LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id + LEFT JOIN st_ivt_iostorinvdis dis ON ios.iostorinv_id = dis.iostorinv_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn WHERE ios.io_type = '1' and ios.is_delete='0' @@ -91,6 +93,14 @@ ios.bill_code like 输入.bill_code ENDOPTION + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn + ENDOPTION + + OPTION 输入.pcsn <> "" + dis.pcsn like 输入.pcsn + ENDOPTION + OPTION 输入.io_type <> "" ios.io_type = 输入.io_type ENDOPTION 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 372d75b20..daf055da9 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 @@ -47,6 +47,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { String bill_code = MapUtil.getStr(whereJson, "bill_code"); String box_no = MapUtil.getStr(whereJson, "box_no"); String material_search = MapUtil.getStr(whereJson, "material_search"); + String pcsn = MapUtil.getStr(whereJson, "pcsn"); + String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn"); map.put("flag", "1"); map.put("stor_id", MapUtil.getStr(whereJson, "stor_id")); map.put("io_type", MapUtil.getStr(whereJson, "io_type")); @@ -55,12 +57,13 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { map.put("is_upload", MapUtil.getStr(whereJson, "is_upload")); map.put("begin_time", MapUtil.getStr(whereJson, "begin_time")); map.put("end_time", MapUtil.getStr(whereJson, "end_time")); - map.put("pcsn", MapUtil.getStr(whereJson, "pcsn")); map.put("is_writeoff", MapUtil.getStr(whereJson, "is_writeoff")); map.put("vbeln", MapUtil.getStr(whereJson, "vbeln")); if (!ObjectUtil.isEmpty(bill_code)) map.put("bill_code", "%" + bill_code + "%"); if (!ObjectUtil.isEmpty(material_search)) map.put("material_search", "%" + material_search + "%"); if (!ObjectUtil.isEmpty(box_no)) map.put("box_no", "%" + box_no + "%"); + if (!ObjectUtil.isEmpty(pcsn)) map.put("pcsn", "%" + pcsn + "%"); + if (!ObjectUtil.isEmpty(sap_pcsn)) map.put("sap_pcsn", "%" + sap_pcsn + "%"); //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index bf8b68c6b..203d741cb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -33,6 +33,7 @@ 输入.is_writeoff TYPEAS s_string 输入.ids TYPEAS f_string 输入.box_no TYPEAS s_string + 输入.sap_pcsn TYPEAS s_string 输入.in_stor_id TYPEAS f_string @@ -71,6 +72,7 @@ LEFT JOIN ST_IVT_IOStorInvDis dis ON dis.iostorinvdtl_id = dtl.iostorinvdtl_id LEFT JOIN sys_user user ON user.user_id = mst.upload_optid INNER JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn WHERE mst.is_delete = '0' and mst.stor_id in 输入.in_stor_id @@ -80,7 +82,11 @@ ENDOPTION OPTION 输入.pcsn <> "" - dtl.pcsn = 输入.pcsn + dis.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn ENDOPTION OPTION 输入.is_writeoff <> "" diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java index 85c271813..f1c70357e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java @@ -39,6 +39,8 @@ public class IostordailyServiceImpl implements IostordailyService { String material_code = MapUtil.getStr(whereJson, "material_code"); String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String pcsn = MapUtil.getStr(whereJson, "pcsn"); + String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn"); + String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); //物料限制的时候使用，初始化页面 String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); HashMap map = new HashMap<>(whereJson); @@ -59,6 +61,8 @@ public class IostordailyServiceImpl implements IostordailyService { map.put("material_code", "%" + material_code + "%"); } if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%" + pcsn + "%"); + if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", "%" + sap_pcsn + "%"); + if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn", "%" + package_box_sn + "%"); //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql index af8b92317..65021bc4f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql @@ -20,6 +20,8 @@ 输入.material_code TYPEAS s_string 输入.classIds TYPEAS f_string 输入.pcsn TYPEAS s_string + 输入.sap_pcsn TYPEAS s_string + 输入.package_box_sn TYPEAS s_string 输入.in_stor_id TYPEAS f_string @@ -64,7 +66,9 @@ da.out_num, da.end_num, da.more_num, - da.less_num + da.less_num, + sub.sap_pcsn, + sub.package_box_sn FROM( SELECT sum(start_num) AS start_num, @@ -90,6 +94,7 @@ LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = da.pcsn WHERE 1=1 and stor.stor_id in 输入.in_stor_id @@ -111,8 +116,15 @@ ENDOPTION OPTION 输入.pcsn <> "" - (da.pcsn like 输入.pcsn or - da.pcsn like 输入.pcsn) + da.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn + ENDOPTION + + OPTION 输入.package_box_sn <> "" + sub.package_box_sn like 输入.package_box_sn ENDOPTION OPTION 输入.classIds <> "" diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue index a0454d178..dab2c6f6c 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue @@ -108,16 +108,16 @@ - + - - + + - - + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 796d6a18b..b76c3d934 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -38,17 +38,6 @@ - - - + + + + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue index 50afe0734..fa16e6f57 100644 --- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue @@ -34,10 +34,11 @@ @current-change="handleDtlCurrentChange" > - - + + - + + @@ -62,10 +63,11 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - - + + + diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue index 211901d09..3a9dd9ce3 100644 --- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue +++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue @@ -36,9 +36,10 @@ - + - + + @@ -64,14 +65,15 @@ > - - + + + - + diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue index 9d33542e0..5c63c22c4 100644 --- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue +++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue @@ -118,8 +118,8 @@ @keyup.enter.native="crud.toQuery" /> - - + + + + + + - - + + + + + + + + + @@ -82,7 +101,10 @@ - + + + +