diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 21f0fb24..ea9f1661 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -3000,67 +3000,67 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { */ @Override public String handleUpdateSAP105(List odsProcureOrders) { - String result="操作失败"; -// for (OdsProcureOrder order: odsProcureOrders){ -// OdsProcureOrder odsProcureOrder = order; -// WmsRawOrderIn wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdTWO(odsProcureOrder.getID()); -// //这个地方 -// Map paramMap=new HashMap<>(); -// List mapList = new ArrayList<>(); -// paramMap.put("S_MBLNR",wmsRawOrderIn.getUserDefined1()); -// paramMap.put("S_MJAHR",wmsRawOrderIn.getUserDefined2()); -// paramMap.put("S_MATNR",wmsRawOrderIn.getMaterialCode()); -// paramMap.put("incomeBatchNo",wmsRawOrderIn.getIncomeBatchNo()); //批次 -// paramMap.put("ebelp",wmsRawOrderIn.getPoLine()); -// paramMap.put("poNo",wmsRawOrderIn.getPoNo()); -// mapList.add(paramMap); -// R result2 = remoteSapService.sap105temporarilyCollected(mapList); -// if (result2.getCode()==200){ -// Map map = new HashMap(); -// map = (Map) result2.getData(); -// String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); -// String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); -// //成功了--成功了,根据 -// WmsRawOrderInSn wmsRawOrderInSn=new WmsRawOrderInSn(); -// wmsRawOrderInSn.setUserDefined5(wmsRawOrderIn.getDnNo()); -// wmsRawOrderInSn.setUserDefined1("1");//暂收 -// -// wmsRawOrderInSn.setUserDefined3(wmsRawOrderIn.getKem()); -// List wmsRawOrderInSnList= wmsRawOrderInSnMapper.selectWmsRawOrderInSnList(wmsRawOrderInSn); -// for (WmsRawOrderInSn wmsRawOrderInSn1: -// wmsRawOrderInSnList) { -// WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn=new WmsOdsMateStorageNewsSn(); -// wmsRawOrderInNewsSn.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); -// wmsRawOrderInNewsSn.setWaCode(wmsRawOrderInSn1.getWaCode()); -// wmsRawOrderInNewsSn.setWhCode(wmsRawOrderInSn1.getWhCode()); -// wmsRawOrderInNewsSn.setWlCode(wmsRawOrderInSn1.getWlCode()); -// wmsRawOrderInNewsSn.setUserDefined3("1"); -// wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnTWM(wmsRawOrderInNewsSn); -// wmsRawOrderInSn1.setUserDefined1("2"); -// wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn1); -// WmsOdsMateStorageNews wmsOdsMateStorageNews=new WmsOdsMateStorageNews(); -// wmsOdsMateStorageNews.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); -// wmsOdsMateStorageNews.setWaCode(wmsRawOrderInSn1.getWaCode()); -// wmsOdsMateStorageNews.setWlCode(wmsRawOrderInSn1.getWlCode()); -// wmsOdsMateStorageNews.setWhCode(wmsRawOrderInSn1.getWhCode()); -// wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); -// wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews); -// } -// wmsRawOrderIn.setOrderStatus("1"); -// wmsRawOrderIn.setAccountingTime(new Date()); -// wmsRawOrderIn.setAccountingMessage(result2.getMsg()); -// wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT); -// wmsRawOrderIn.setUserDefined5(MATDOCUMENTYEAR); -// wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); -// -// }else { -// //失败了 -// wmsRawOrderIn.setAccountingTime(new Date()); -// wmsRawOrderIn.setAccountingMessage(result2.getMsg()); -// wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); -// -// } -// } + String result="操作成功"; + for (OdsProcureOrder order: odsProcureOrders){ + OdsProcureOrder odsProcureOrder = order; + WmsRawOrderIn wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdTWO(odsProcureOrder.getID()); + //这个地方 + Map paramMap=new HashMap<>(); + List mapList = new ArrayList<>(); + paramMap.put("S_MBLNR",wmsRawOrderIn.getUserDefined1()); + paramMap.put("S_MJAHR",wmsRawOrderIn.getUserDefined2()); + paramMap.put("S_MATNR",wmsRawOrderIn.getMaterialCode()); + paramMap.put("incomeBatchNo",wmsRawOrderIn.getIncomeBatchNo()); //批次 + paramMap.put("ebelp",wmsRawOrderIn.getPoLine()); + paramMap.put("poNo",wmsRawOrderIn.getPoNo()); + mapList.add(paramMap); + R result2 = remoteSapService.sap105temporarilyCollected(mapList); + if (result2.getCode()==200){ + Map map = new HashMap(); + map = (Map) result2.getData(); + String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); + //成功了--成功了,根据 + WmsRawOrderInSn wmsRawOrderInSn=new WmsRawOrderInSn(); + wmsRawOrderInSn.setUserDefined5(wmsRawOrderIn.getDnNo()); + wmsRawOrderInSn.setUserDefined1("1");//暂收 + + wmsRawOrderInSn.setUserDefined3(wmsRawOrderIn.getKem()); + List wmsRawOrderInSnList= wmsRawOrderInSnMapper.selectWmsRawOrderInSnList(wmsRawOrderInSn); + for (WmsRawOrderInSn wmsRawOrderInSn1: + wmsRawOrderInSnList) { + WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn=new WmsOdsMateStorageNewsSn(); + wmsRawOrderInNewsSn.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); + wmsRawOrderInNewsSn.setWaCode(wmsRawOrderInSn1.getWaCode()); + wmsRawOrderInNewsSn.setWhCode(wmsRawOrderInSn1.getWhCode()); + wmsRawOrderInNewsSn.setWlCode(wmsRawOrderInSn1.getWlCode()); + wmsRawOrderInNewsSn.setUserDefined3("1"); + wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnTWM(wmsRawOrderInNewsSn); + wmsRawOrderInSn1.setUserDefined1("2"); + wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn1); + WmsOdsMateStorageNews wmsOdsMateStorageNews=new WmsOdsMateStorageNews(); + wmsOdsMateStorageNews.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); + wmsOdsMateStorageNews.setWaCode(wmsRawOrderInSn1.getWaCode()); + wmsOdsMateStorageNews.setWlCode(wmsRawOrderInSn1.getWlCode()); + wmsOdsMateStorageNews.setWhCode(wmsRawOrderInSn1.getWhCode()); + wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); + wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews); + } + wmsRawOrderIn.setOrderStatus("1"); + wmsRawOrderIn.setAccountingTime(new Date()); + wmsRawOrderIn.setAccountingMessage(result2.getMsg()); + wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT); + wmsRawOrderIn.setUserDefined5(MATDOCUMENTYEAR); + wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); + + }else { + //失败了 + wmsRawOrderIn.setAccountingTime(new Date()); + wmsRawOrderIn.setAccountingMessage(result2.getMsg()); + wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); + + } + } return result; }