diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.xml index 653172e..8a6480e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.xml @@ -593,45 +593,25 @@ AND ios.input_time #{paramMap.end_time} ) ios2 - - INNER JOIN ( - SELECT - dis.iostorinv_id - FROM - st_ivt_iostorinvdis dis - LEFT JOIN pdm_bi_subpackagerelationrecord sub ON sub.container_name = dis.pcsn - WHERE - 1 = 1 - - AND dis.box_no LIKE '%${paramMap.box_no}%' - - - AND dis.box_no IN - - #{code} - - - - AND dis.pcsn LIKE '%${paramMap.pcsn}%' - - - AND dis.pcsn IN - - #{code} - - - - AND sub.sap_pcsn LIKE '%${paramMap.sap_pcsn}%' - - - AND sub.sap_pcsn IN - - #{code} - - - GROUP BY dis.iostorinv_id - ) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id + INNER JOIN ( + SELECT + dis.iostorinv_id + FROM + st_ivt_iostorinvdis dis + LEFT JOIN pdm_bi_subpackagerelationrecord sub ON sub.container_name = dis.pcsn + WHERE + 1 = 1 + + AND dis.box_no LIKE '%${paramMap.box_no}%' + + AND dis.pcsn LIKE '%${paramMap.pcsn}%' + + + AND sub.sap_pcsn LIKE '%${paramMap.sap_pcsn}%' + + GROUP BY dis.iostorinv_id + ) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id INNER JOIN ( SELECT dtl.iostorinv_id, diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index 3f88a4d..b8f3896 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -231,22 +231,6 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { paramMap.setBox_no_in(StringDealUtils.splitString(paramMap.getBox_no())); paramMap.setSap_pcsn_in(StringDealUtils.splitString(paramMap.getSap_pcsn())); paramMap.setVbeln_in(StringDealUtils.splitString(paramMap.getVbeln())); - if (CollectionUtil.isNotEmpty(paramMap.getPcsn_in())) { - paramMap.setPcsn(""); - paramMap.setFlag("1"); - } - if (CollectionUtil.isNotEmpty(paramMap.getBox_no_in())) { - paramMap.setBox_no(""); - paramMap.setFlag("1"); - } - if (CollectionUtil.isNotEmpty(paramMap.getSap_pcsn_in())) { - paramMap.setSap_pcsn(""); - paramMap.setFlag("1"); - } - if (CollectionUtil.isNotEmpty(paramMap.getVbeln_in())) { - paramMap.setVbeln(""); - paramMap.setFlag("1"); - } //获取人员对应的仓库 List storIds = bsrealstorattrService.getStoreForUser(SecurityUtils.getCurrentUserId()); paramMap.setIn_stor_id(storIds);