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

update MES物料消耗接口优化，去掉匹配工单条件

Browse Source
This commit is contained in:
18110972313 2025-05-24 17:51:42 +08:00
parent 67b3e39472
commit 497b954355
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2716,7 +2716,7 @@ public class ToSAPServiceImpl {
} }
//MES上报工单消耗数据-261工单投料 //MES上报工单消耗数据-261工单投料
public String mesMaterialConsume( String user, String payMentDate, EventInfo eventInfo) throws Exception { public String mesMaterialConsume( String user, String payMentDate, EventInfo eventInfo, String aufnr) throws Exception {
String rcode; String rcode;
String undoId = ""; String undoId = "";
@ -2799,7 +2799,7 @@ public class ToSAPServiceImpl {
//item.put("ZLLITEM", maps.get(i).get("RESERVEDPROJECTNUMB")); //item.put("ZLLITEM", maps.get(i).get("RESERVEDPROJECTNUMB"));
item.put("ZLLITEM", maps.get(i).get("SHIPREQUESTDETAILNAME")); item.put("ZLLITEM", maps.get(i).get("SHIPREQUESTDETAILNAME"));
//AUFNR 订单号 //AUFNR 订单号
item.put("AUFNR", maps.get(i).get("WO")); item.put("AUFNR", aufnr);
String materialPackingName = maps.get(i).get("MATERIALPACKINGNAME") == null ? "" : maps.get(i).get("MATERIALPACKINGNAME").toString(); String materialPackingName = maps.get(i).get("MATERIALPACKINGNAME") == null ? "" : maps.get(i).get("MATERIALPACKINGNAME").toString();
if (StringUtils.isNotEmpty(materialPackingName)){ if (StringUtils.isNotEmpty(materialPackingName)){
materialPackingNameList.add(materialPackingName); materialPackingNameList.add(materialPackingName);

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

@ -68,7 +68,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
loginfo.setEventName("materialConsume_Request"); loginfo.setEventName("materialConsume_Request");
String siteName = System.getProperty("company", "SDK"); String siteName = System.getProperty("company", "SDK");
EventInfo eventInfo = new com.cim.idm.wmsextend.generic.util.EventInfoUtil().makeEventInfo("MES消耗UNDOID", "MES", "MES消耗UNDOID", "", ""); EventInfo eventInfo = new com.cim.idm.wmsextend.generic.util.EventInfoUtil().makeEventInfo("MES消耗UNDOID", "MES", "MES消耗UNDOID", "", "");
String aufnr = "";
List<String> boxIdList = new ArrayList<>(); List<String> boxIdList = new ArrayList<>();
List<String> qtyList = new ArrayList<>(); List<String> qtyList = new ArrayList<>();
List<MaterialPackingKey> mpList = new ArrayList<>(); List<MaterialPackingKey> mpList = new ArrayList<>();
@ -118,6 +118,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
} }
//调用存储MES_CONSUME //调用存储MES_CONSUME
String procedureName = "MES_CONSUME"; String procedureName = "MES_CONSUME";
aufnr = wo;
// 调用存储过程返回参数 // 调用存储过程返回参数
// IDMFrameServiceProxy.getSqlTemplate().getJdbcTemplate().execute(procedureName); // IDMFrameServiceProxy.getSqlTemplate().getJdbcTemplate().execute(procedureName);
Map<String, Object> bindMap = new HashMap<String, Object>() { Map<String, Object> bindMap = new HashMap<String, Object>() {
@ -145,7 +146,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
} }
// 将工单的物料消耗数据传给SAP // 将工单的物料消耗数据传给SAP
String undoId = toSAPService.mesMaterialConsume("MES",payMentDate, eventInfo); String undoId = toSAPService.mesMaterialConsume("MES",payMentDate, eventInfo,aufnr);
result = AjaxResult.me().setSuccess(true).setErrorCode(200).setMessage("执行成功").setResultObj(undoId); result = AjaxResult.me().setSuccess(true).setErrorCode(200).setMessage("执行成功").setResultObj(undoId);
loginfo.setResultCode("0"); loginfo.setResultCode("0");
loginfo.setReturnMsg(JSONObject.toJSONString(result)); loginfo.setReturnMsg(JSONObject.toJSONString(result));