root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: root:a650046f56cdf1cdf732ec344189d33f0e7e1cc1
Branches Tags
root:master
...
compare: root:72c681679d5bff3e7fca73f026cd496213a84c6d
Branches Tags
root:master

2 Commits
a650046f56 ... 72c681679d

Author SHA1 Message Date
ls
72c681679d Merge remote-tracking branch 'origin/master' 2026-01-29 09:46:52 +08:00
ls
f18861d1d8 add 木箱号查询、销售员 2026-01-29 09:46:04 +08:00
2 changed files with 18 additions and 54 deletions
Expand all files Collapse all files

56
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.xml
View File

@@ -593,45 +593,25 @@
AND ios.input_time <![CDATA[ <= ]]> #{paramMap.end_time}
</if>
) ios2
<if test="paramMap.flag != null and paramMap.flag != ''">
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
<if test="paramMap.box_no != null and paramMap.box_no != ''">
AND dis.box_no LIKE '%${paramMap.box_no}%'
</if>
<if test="paramMap.box_no_in != null and !paramMap.box_no_in.isEmpty()">
AND dis.box_no IN
<foreach collection="paramMap.box_no_in" item="code" separator="," open="(" close=")">
#{code}
</foreach>
</if>
<if test="paramMap.pcsn != null and paramMap.pcsn != ''">
AND dis.pcsn LIKE '%${paramMap.pcsn}%'
</if>
<if test="paramMap.pcsn_in != null and !paramMap.pcsn_in.isEmpty()">
AND dis.pcsn IN
<foreach collection="paramMap.pcsn_in" item="code" separator="," open="(" close=")">
#{code}
</foreach>
</if>
<if test="paramMap.sap_pcsn != null and paramMap.sap_pcsn != ''">
AND sub.sap_pcsn LIKE '%${paramMap.sap_pcsn}%'
</if>
<if test="paramMap.sap_pcsn_in != null and !paramMap.sap_pcsn_in.isEmpty()">
AND sub.sap_pcsn IN
<foreach collection="paramMap.sap_pcsn_in" item="code" separator="," open="(" close=")">
#{code}
</foreach>
</if>
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
<if test="paramMap.box_no != null and paramMap.box_no != ''">
AND dis.box_no LIKE '%${paramMap.box_no}%'
</if>
<if test="paramMap.pcsn != null and paramMap.pcsn != ''">
AND dis.pcsn LIKE '%${paramMap.pcsn}%'
</if>
<if test="paramMap.sap_pcsn != null and paramMap.sap_pcsn != ''">
AND sub.sap_pcsn LIKE '%${paramMap.sap_pcsn}%'
</if>
GROUP BY dis.iostorinv_id
) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
INNER JOIN (
SELECT
dtl.iostorinv_id,

16
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -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<String> storIds = bsrealstorattrService.getStoreForUser(SecurityUtils.getCurrentUserId());
paramMap.setIn_stor_id(storIds);