diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index fdd5a971..dfe9e495 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -68,4 +68,6 @@ public interface OdsProcureOrderMapper { void updateOdsProcureOrderAddOperationNumber(OdsProcureOrder odsProcureOrder); List selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder); + + void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder); } 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 563178f3..dcdfb992 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 @@ -810,6 +810,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setActive("1"); List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); if (orderList.size() > 0) { + //这个地方判断下是不是采购单已经被插入了,如果是的话,并且是走的送货单的路径,那就把送货单给她附上 + if (odsProcureOrder.getUserDefined5()!=null){ + order.setUserDefined5(mainId); + odsProcureOrderMapper.updateOdsProcureOrderByProcureCode(order); + } continue; } order.setUserDefined5(mainId);//送货单 @@ -912,8 +917,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //取sap仓库号 SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery(); sapBackflushMPQuery.setPlant(odsProcureOutOrder.getSiteCode()); //工厂 - String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode()); - sapBackflushMPQuery.setLgort(lgort);//库存地点 + sapBackflushMPQuery.setLgort("0013");//反冲0013 sapBackflushMPQuery.setMatnr(odsProcureOutOrder.getMaterialCode());//物料号 sapBackflushMPQuery.setQuantity(odsProcureOutOrder.getOutNumber().toString()); //数量 sapBackflushMPQuery.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位 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 b2587880..a2ccd8c4 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 @@ -234,4 +234,15 @@ and Material_Code = #{materialCode} + +