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

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr

Browse Source
This commit is contained in:
郭飞 2025-04-01 19:46:37 +08:00
commit 78bb0fcdbc
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,7 +352,8 @@ public class ToSAPServiceImpl {
rcode = returnJsonObject.get("STATUS").toString();
rmsg = returnJsonObject.get("MSGTXT").toString();
if ("S".equals(rcode)) {
undoId2 = returnJsonObject.get("MBLNR").toString()+"_"+returnJsonObject.get("MJAHR").toString();//将物料凭证号与凭证年度拼在一起
undoId2 = returnJsonObject.get("MBLNR") == null ? "" : returnJsonObject.get("MBLNR").toString()
+"_"+returnJsonObject.get("MJAHR") == null ? "" : returnJsonObject.get("MJAHR").toString();//将物料凭证号与凭证年度拼在一起
}
} catch (Exception e) {
log.error("WMS请求SAP异常:" + e.getMessage(), e);

12
zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java
View File

@ -48,18 +48,26 @@ public class MESToWMSController {
@ApiOperation(value = "取消物料入库请求")
@RequestMapping(value = "/meswms_cancelship_request", method = RequestMethod.POST)
public AjaxResult cancelShipByMES(@RequestBody JSONArray in) throws Exception {
public AjaxResult cancelShipByMES(@RequestBody JSONArray in) {
log.info("Received cancel ship request: {}", in.toJSONString());
String undoId = in.getJSONObject(0).getString("undoId");
String userId = in.getJSONObject(0).getString("userId");
// return mesToWMSService.cancelShipByMES(in);
try {
return mesToWMSService.sapcprkUndo(undoId, userId);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@ApiOperation(value = "物料入库请求")
@RequestMapping(value = "/meswms_ship_request", method = RequestMethod.POST)
public AjaxResult shipByMES(@RequestBody JSONArray in) throws Exception {
public AjaxResult shipByMES(@RequestBody JSONArray in) {
log.info("Received ship request: {}", in.toJSONString());
try {
return mesToWMSService.shipByMES(in);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}