10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: 10539622:cab708e6a5bd3924b608889a7aa4c04c9c729268
Branches Tags
10539622:main
...
compare: 10539622:1f345b3d58f81efb932b93c02deec640ee6c259d
Branches Tags
10539622:main

2 Commits
cab708e6a5 ... 1f345b3d58

Author SHA1 Message Date
郭飞
1f345b3d58 Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-04-24 09:40:36 +08:00
郭飞
5447059846 fix:修改备货出库现场仓去除多余已入库的批次 2025-04-24 09:40:30 +08:00
1 changed files with 16 additions and 5 deletions
Show Stats Expand all files Collapse all files

19
zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
View File

@ -670,10 +670,21 @@ public class SaleOutController {
Map<String, Object> hashMap = new HashMap<String,Object> ();
hashMap.put("SHIPREQUESTNAME", shipRequestName);
String sqlGetBox="SELECT m.MATERIALPACKINGNAME,m.MATERIALQUANTITY,DECODE(NVL(m.MATERIALQUANTITY2,0), 0 ,m.MATERIALQUANTITY,m.MATERIALQUANTITY2) MATERIALQUANTITY2 FROM MATERIALPACKING m \r\n" +
" WHERE m.SHIPREQUESTNAME =:SHIPREQUESTNAME\r\n" +
" AND m.STOCKSTATE ='Stocked'\r\n" +
" AND m.MATERIALQUANTITY2 >0";
// 关联详情单据，去除当是现场仓时多余已经入库到现场仓的批次条码
String sqlGetBox="SELECT\n" +
"m.MATERIALPACKINGNAME,\n" +
"m.MATERIALQUANTITY,\n" +
"DECODE(NVL(m.MATERIALQUANTITY2, 0), 0 , m.MATERIALQUANTITY, m.MATERIALQUANTITY2) MATERIALQUANTITY2\n" +
"FROM\n" +
"MATERIALPACKING m\n" +
"LEFT JOIN MATERIALSHIPREQUESTDETAIL mdl ON\n" +
"mdl.SHIPREQUESTNAME=m.SHIPREQUESTNAME \n" +
"AND mdl.MATERIALSPECNAME = m.MATERIALSPECNAME\n" +
"WHERE\n" +
"m.SHIPREQUESTNAME =:SHIPREQUESTNAME\n" +
"AND m.STOCKSTATE = 'Stocked'\n" +
"AND m.MATERIALQUANTITY2 >0\n" +
"AND (m.ERPLOCATION <> mdl.ERPRECEIVELOCATION OR mdl.ERPRECEIVELOCATION IS NULL)";
List<Map<String, Object>> sr = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlGetBox, hashMap);
if(sr.size()>0)
{