diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index d038a5b44..a5808f8af 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -506,6 +506,11 @@ public class SapOrderServiceImpl implements SapOrderService { L_ITEM.setValue("BATCH", stringObjectMap.get("BATCH")); L_ITEM.setValue("HSDAT", stringObjectMap.get("HSDAT")); L_ITEM.setValue("ERFME", stringObjectMap.get("ERFME")); + if (stringObjectMap.get("STCK_TYPE").equals("1")){ + L_ITEM.setValue("STCK_TYPE", ""); + }else { + L_ITEM.setValue("STCK_TYPE", stringObjectMap.get("STCK_TYPE")); + } } func.execute(dest);//执行调用函数 System.out.println(func.getExportParameterList()); 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 bf70c217c..ecc21fdbc 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 @@ -791,6 +791,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); order.setSapTempInfor(result2.getMsg()); WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn(); + wmsRawOrderIn.setOrderNo(order.getUserDefined5()); wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); wmsRawOrderIn.setDnNo(odsProcureOrder.getReceiptNoCode()); @@ -1560,7 +1561,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { orderList) { OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); - odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); + odsProcureOutOrder1.setSiteCode(odsProcureOutOrder.getFactoryCode()); odsProcureOutOrder1.setProduceCode(odsProcureOutOrder.getUserDefined4());//反冲 odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); //odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); @@ -1614,7 +1615,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { orderList) { OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); - odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); + odsProcureOutOrder1.setSiteCode(odsProcureOutOrder.getFactoryCode()); odsProcureOutOrder1.setProduceCode(order1.getWorkorderCode()); odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); //odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); @@ -1702,7 +1703,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setActive("1"); order.setCreateBy(createBy); order.setCreateDate(new Date()); - order.setSiteCode(factoryCode); + //order.setSiteCode(factoryCode); odsProcureOutOrderMapper.insertWmsRawMissionOut(order); OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); odsProcureOutOrder1.setProduceCode(produceCode); 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 3e3db616d..0d23c1bde 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 @@ -280,6 +280,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { String msgs = "操作完成"; for (WmsProductPut wmsProductPut1 : wmsProductPut) { + String status = wmsProductPut1.getStatus(); WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId()); if (wmsProductPutSAPById != null) { List wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId()); @@ -295,6 +296,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("QUANTITY", wmsProductPut3.getPutQuantity()); map.put("ERFME", wmsProductPut3.getUnitOfMeasure()); map.put("BATCH", wmsProductPut3.getAttr4()); + map.put("STCK_TYPE", wmsProductPut1.getAttr3()); //map.put("BATCH", wmsProductPut3.getBatchNumber()); // if (wmsProductPut3.getBatchNumber().length()>12){ // //String batch = mesReportWork.getBatch().substring(12); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 5a11a49fa..fdae2874a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -319,7 +319,7 @@ AND CONVERT(date, Last_Update_Date, 23) >= #{lastUpdateDateMIN} and Material_Code = #{materialCode} - + and Material_Code = #{userDefined5}