diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 79486b46..b49b2ff7 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -1179,16 +1179,16 @@ public class SapItemSyncImpl implements SapItemSyncService { L_ITEM.setValue("AUFNR", map.get("AUFNR")); L_ITEM.setValue("WERKS", map.get("WERKS")); L_ITEM.setValue("LGORT", map.get("LGORT")); - L_ITEM.setValue("MATNR", map.get("MATNR")); + L_ITEM.setValue("STCK_TYPE", ""); +// L_ITEM.setValue("MATNR", map.get("MATNR")); L_ITEM.setValue("QUANTITY", map.get("QUANTITY")); L_ITEM.setValue("ERFME", map.get("ERFME")); L_ITEM.setValue("BATCH", map.get("BATCH")); - L_ITEM.setValue("STCK_TYPE", ""); + System.out.println(L_ITEM); func.execute(dest); - String L_MSG = func.getExportParameterList().getString("L_MSG"); String RETCODE = func.getExportParameterList().getString("RETCODE"); String MATERIALDOCUMENT = func.getExportParameterList().getString("MATERIALDOCUMENT"); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 6220194a..baafad3c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1279,19 +1279,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return wmsSellOutEmbryoList; } - /** - * LFBJA NUMC 4 0 参考凭证会计年度 必填 - * LFBNR CHAR 10 0 参考凭证的凭证号 必填 - * LFPOS NUMC 4 0 参考凭证项目 必填 - * EBELN CHAR 10 0 采购凭证号 必填 - * EBELP NUMC 5 0 采购凭证的项目编号 必填 - * MATNR CHAR 18 0 物料号 必填 - * QUANTITY QUAN 13 3 数量 必填 - * WERKS CHAR 4 0 工厂 必填 - * LGORT CHAR 4 0 库存地点 必填 - * @param wmsProductPutList - * @return - */ + @Override @DS("#header.poolName") public String handleUpdateSAP102(List wmsProductPutList) { @@ -1323,17 +1311,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { R result2 = remoteSapService.handleUpdateSAP102(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); + Map map = new HashMap(); + map = (Map) result2.getData(); + String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); + //成功了--成功了,根据 + WmsProductPut wmsProductPut2=new WmsProductPut();//成品生产入库对象 + +// List wmsRawOrderInSnList= wmsProductPutMapper.selectWmsProductPutList(wmsProductPut2); // for (WmsRawOrderInSn wmsRawOrderInSn1: // wmsRawOrderInSnList) { // WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn=new WmsOdsMateStorageNewsSn(); @@ -1353,18 +1338,25 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { // 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); + wmsProductPut2= wmsProductPut1; +// wmsProductPut2.setPutQuantity(new BigDecimal("0")); + wmsProductPut2.setSapStatus("0");//暂收 + wmsProductPut2.setAttr5(MATERIALDOCUMENT); + wmsProductPut2.setAttr6(MATDOCUMENTYEAR); + wmsProductPut2.setAttr7(result2.getMsg()); + + wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); }else { -// //失败了 -// wmsProductPut.set(new Date()); -// wmsProductPut.setAccountingMessage(result2.getMsg()); -// wmsProductPutMapper.updateWmsRawOrderIn(wmsProductPut); + //失败了 + WmsProductPut wmsProductPut2=new WmsProductPut();//成品生产入库对象 + wmsProductPut2= wmsProductPut1; +// wmsProductPut2.setPutQuantity(new BigDecimal("0")); + //wmsProductPut2.setSapStatus("0");//暂收 +// wmsProductPut2.setAttr5(MATERIALDOCUMENT); +// wmsProductPut2.setAttr6(MATDOCUMENTYEAR); + wmsProductPut2.setAttr7(result2.getMsg()); + wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); } }