From 01c26850ef5167dff0b265d3fb3906e604e0824d Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 15 Jul 2024 15:06:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?wms=E9=87=87=E8=B4=AD=E6=8F=90=E5=8D=95-?=
 =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E6=8F=90=E5=8D=95--=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/wms/mapper/OdsProcureOrderMapper.java |  2 ++
 .../wms/service/impl/OdsProcureOrderServiceImpl.java  |  5 +++++
 .../resources/mapper/wms/OdsProcureOrderMapper.xml    | 11 +++++++++++
 3 files changed, 18 insertions(+)

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 fdd5a971b..dfe9e4958 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<OdsProcureOrder> 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 563178f33..00c54f2b8 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<OdsProcureOrder> orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order);
             if (orderList.size() > 0) {
+                //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上
+                if (odsProcureOrder.getUserDefined5()!=null){
+                    order.setUserDefined5(mainId);
+                    odsProcureOrderMapper.updateOdsProcureOrderByProcureCode(order);
+                }
                 continue;
             }
             order.setUserDefined5(mainId);//送货单
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 b2587880c..a2ccd8c4a 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 @@
         <if test="materialCode != null  and materialCode != ''">and Material_Code = #{materialCode}</if>
 
     </select>
+    <select id="updateOdsProcureOrderByProcureCode"    parameterType="OdsProcureOrder">
+        update ods_procure_order
+        SET User_Defined5 =  #{userDefined5}
+        where Procure_Code=  #{procureCode}
+          and  Site_code=     #{siteCode}
+          and   Material_Code=  #{materialCode}
+          and    Material_Desc=  #{materialDesc}
+          and  Active=   #{Active}
+
+    </select>
 </mapper>
+

From d9acff1f1dc88b7976d4111b44e2205dc7833364 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 15 Jul 2024 15:34:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wms=E9=87=87=E8=B4=AD=E6=8F=90=E5=8D=95-?=
 =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E6=8F=90=E5=8D=95--=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 00c54f2b8..dcdfb992e 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
@@ -917,8 +917,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             //取ｓａｐ仓库号
                 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()); //基本计量单位