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

fix:修改e库存

Browse Source
This commit is contained in:
郭飞 2025-05-19 19:36:43 +08:00
parent e2e25a1e39
commit 6a9b526fed
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java
View File

@ -1794,7 +1794,7 @@ public class InvoiceController {
String ressSql = "SELECT\r\n" + String ressSql = "SELECT\r\n" +
" A.MATERIALPACKINGNAME ,A.MATERIALSPECNAME,A.MATERIALQUANTITY, CASE WHEN MATERIALQUANTITY2 > 0 THEN A.MATERIALQUANTITY2 " + " A.MATERIALPACKINGNAME ,A.MATERIALSPECNAME,A.MATERIALQUANTITY, CASE WHEN MATERIALQUANTITY2 > 0 THEN A.MATERIALQUANTITY2 " +
" ELSE A.MATERIALQUANTITY END MATERIALQUANTITY2,A.AREANAME ,A.SHELFNAME ,\r\n" + " ELSE A.MATERIALQUANTITY END MATERIALQUANTITY2,A.AREANAME ,A.SHELFNAME ,\r\n" +
" A.CHARGE ,\r\n" + " A.CHARGE ,A.SALESHIPREQUESTNAME,A.SALESHIPREQUESTDETAILNAME,\r\n" +
" TO_CHAR(A.RECEIVETIME, 'YYYY-MM-DD') RECEIVETIME,A.SDK_ID,A.PHASE,\r\n" + " TO_CHAR(A.RECEIVETIME, 'YYYY-MM-DD') RECEIVETIME,A.SDK_ID,A.PHASE,\r\n" +
" be.DESCRIPTION ERPLOCATION,\r\n" + " be.DESCRIPTION ERPLOCATION,\r\n" +
" s.DESCRIPTION LOCATIONNAME,\r\n" + " s.DESCRIPTION LOCATIONNAME,\r\n" +
@ -1832,6 +1832,21 @@ public class InvoiceController {
hashMap.put("SITENAME", "SDK"); hashMap.put("SITENAME", "SDK");
hashMap.put("SHIPREQUESTNAME", shipRequestName); hashMap.put("SHIPREQUESTNAME", shipRequestName);
List<Map<String, Object>> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(ressSql, hashMap); List<Map<String, Object>> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(ressSql, hashMap);
// 如果是需要判定E库存的话，则进行判定
String EStockSql = "SELECT ENUMVALUE FROM ENUMDEFVALUE WHERE ENUMNAME = 'EStockType'";
List<Map<String, Object>> EnumList = IDMFrameServiceProxy.getSqlTemplate().queryForList(EStockSql);
String enumvalue = EnumList.get(0).get("ENUMVALUE").toString();
if("Y".equals(enumvalue)) {
for (int i = 0; i < queryForList.size(); i++) {
String saleshiprequestname = queryForList.get(i).get("SALESHIPREQUESTNAME") == null ? "" : queryForList.get(i).get("SALESHIPREQUESTNAME").toString();
if(!saleshiprequestname.isEmpty() && !saleshiprequestname.equals(shipRequestName)) {
queryForList.remove(i);
}
}
}
return AjaxResult.me().setResultObj(queryForList); return AjaxResult.me().setResultObj(queryForList);
} }

7
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java
View File

@ -775,9 +775,14 @@ public class ProductIntoServiceImpl implements FGStockInService {
if("Y".equals(is_oven)) { if("Y".equals(is_oven)) {
bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());//熟化入库时间 bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());//熟化入库时间
} }
bindMap.put("saleShipRequestName", queryForList.get(0).get("SALESHIPREQUESTNAME") == null ? "" : queryForList.get(0).get("SALESHIPREQUESTNAME").toString() ); String saleShipRequestName = queryForList.get(0).get("SALESHIPREQUESTNAME") == null ? "" : queryForList.get(0).get("SALESHIPREQUESTNAME").toString();
bindMap.put("saleShipRequestName", saleShipRequestName);
bindMap.put("saleShipRequestDetailName", queryForList.get(0).get("SALESHIPREQUESTDETAILNAME") == null ? "" : queryForList.get(0).get("SALESHIPREQUESTDETAILNAME").toString() ); bindMap.put("saleShipRequestDetailName", queryForList.get(0).get("SALESHIPREQUESTDETAILNAME") == null ? "" : queryForList.get(0).get("SALESHIPREQUESTDETAILNAME").toString() );
if(!saleShipRequestName.isEmpty()) {
String POCATEGORY = "4";
bindMap.put("POCATEGORY", POCATEGORY);
}
//增加立库相关信息T.LK_DURABLENAME,T.LK_AREANAME,T.LK_PRODUCTLINE,T.LK_WIDTH ,T.LK_DEVIATION,T.LK_WEIGHT,T.LK_DIAMETER,T.LK_SHELFNAME //增加立库相关信息T.LK_DURABLENAME,T.LK_AREANAME,T.LK_PRODUCTLINE,T.LK_WIDTH ,T.LK_DEVIATION,T.LK_WEIGHT,T.LK_DIAMETER,T.LK_SHELFNAME
bindMap.put("durableName", queryForList.get(0).get("LK_DURABLENAME")); bindMap.put("durableName", queryForList.get(0).get("LK_DURABLENAME"));
bindMap.put("areaName", queryForList.get(0).get("LK_AREANAME")); bindMap.put("areaName", queryForList.get(0).get("LK_AREANAME"));