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

fix：产成品入库日期过账

Browse Source
This commit is contained in:
郭飞 2025-05-06 19:54:03 +08:00
parent 66037b8a7c
commit 856254fb07
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
View File

@ -32,7 +32,7 @@ public class ToSAPServiceImpl {
public String PurStockIn(String receiveRequestName, String siteName, String user,
Map<String, ?> args) throws Exception {
Map<String, ?> args,String commitDate) throws Exception {
String rcode;
String undoId = "";
@ -118,7 +118,7 @@ public class ToSAPServiceImpl {
}
String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData, TimeStampUtil.getCurrentTime("yyyyMMdd"));
String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData, commitDate);
String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData);
org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn);
@ -1407,10 +1407,15 @@ public class ToSAPServiceImpl {
*/
//交货单号
body.put("VBELN", shipRequestName);
SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd");
Date date = inputFormat.parse(commitDate);
String outputDate = outputFormat.format(date);
//实际过账日期
body.put("WADAT_IST", TimeStampUtil.getCurrentTime("yyyyMMdd"));//yyyyMMddhhmmss
body.put("WADAT_IST", outputDate);//yyyyMMddhhmmss
//发送日期
body.put("Z_SENDDATE", TimeStampUtil.getCurrentTime("yyyyMMdd"));
body.put("Z_SENDDATE", outputDate);
//操作类型（过账）
body.put("Z_OPTION", "1");
@ -1684,10 +1689,9 @@ public class ToSAPServiceImpl {
return sendData.toJSONString();
}
public String PurStockIn(String receiveRequestName, String siteName, String eventUser, String receiveActno,
Map<String, ?> args/* , List<Map<String,Object>> overReceiveControls */) {
public String PurStockIn(String receiveRequestName, String siteName, String eventUser, String receiveActno, Map<String, ?> args,String commitDate) {
try {
return PurStockIn(receiveRequestName, siteName, eventUser, args/* ,overReceiveControls */);
return PurStockIn(receiveRequestName, siteName, eventUser, args,commitDate);
} catch (Exception e) {
log.error(e.getMessage(),e);
return "";
@ -1875,7 +1879,7 @@ public class ToSAPServiceImpl {
case "Z006" : //股份- 泗洪STO
case "Z007" : //股份泗洪-分子公司STO
Map<String,Object> args = new HashMap<>();
billCode = PurStockIn(receiveRequestName, siteName, eventUser, reActo, args/* ,overReceiveControls */);
// billCode = PurStockIn(receiveRequestName, siteName, eventUser, reActo, args/* ,overReceiveControls */);
break;
case "NLCC" : //调拨入库
billCode = AlloctionStockIn(receiveRequestName, siteName, eventUser,"");

4
zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
View File

@ -526,7 +526,7 @@ public class MaterialReceiveActController {
// 采购订单
if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) {
Map<String,Object> args = new HashMap<>();
undoId = toSAPServiceImpl.PurStockIn(receiveRequestName, siteName, user, args);
undoId = toSAPServiceImpl.PurStockIn(receiveRequestName, siteName, user, args, commitDate);
}else if( ReceiveTypeEnums.isSaleReturn(request.getReceiveRequestType())) {
undoId = toSAPServiceImpl.SaleReturn(receiveRequestName, siteName, user, commitDate, opCode);
}
@ -585,7 +585,7 @@ public class MaterialReceiveActController {
case "Z004" : //固定资产、在建工程采购订单
Map<String,Object> args = new HashMap<>();
billCode = toSAPServiceImpl.PurStockIn(receiveRequestName, siteName, eventUser,
args/* ,overReceiveControls */);
args,commitDate);
break;
case "Z005" : //服务费用采购订单
case "Z006" : //股份 - 泗洪STO

2
zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java
View File

@ -255,7 +255,7 @@ public class NoChargeStockIn {
// 采购订单
if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) {
Map<String,Object> args = new HashMap<>();
billcode = toSAPServiceImpl.PurStockIn(request.getReceiveRequestName(), siteName, user, args);
billcode = toSAPServiceImpl.PurStockIn(request.getReceiveRequestName(), siteName, user, args,commitDate);
}
// @TODO 其他类型
if (billcode == null || "".equals(billcode)) {