From c4b19d376cfebffe2d405961d5c53fedf501c657 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 29 Aug 2024 15:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=85=A5=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9-=20=E6=89=AB=E7=A0=81=E7=89=A9=E6=96=99=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=8D=A1--=E8=8E=B7=E5=8F=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmsToWCSmissionController.java |  8 +++++--
 .../op/wms/mapper/OdsProcureOrderMapper.java  |  2 ++
 .../wms/service/IOdsProcureOrderService.java  |  2 ++
 .../impl/OdsProcureOrderServiceImpl.java      | 10 +++++++++
 .../mapper/wms/OdsProcureOrderMapper.xml      | 21 +++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
index d97aaa75..1df02da5 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
@@ -781,8 +781,12 @@ public class WmsToWCSmissionController {
         BaseWarehouse baseWarehouse = baseAreaService.listTableCK(baseArea);
         return success(baseWarehouse);
     }
-    //扫码物料标识卡
-
+    //扫码物料标识卡--获取信息
+    @PostMapping("/selectOrderCard")
+    public AjaxResult selectOrderCard(@RequestBody OdsProcureOrder odsProcureOrder) {
+        OdsProcureOrder odsProcureOrder1 = odsProcureOrderService.selectOrderCard(odsProcureOrder);
+        return success(odsProcureOrder1);
+    }
 
 
 }
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 09de2d8f..d8dc69ac 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
@@ -75,4 +75,6 @@ public interface OdsProcureOrderMapper {
     List<OdsProcureOrder> getIdCardList(OdsProcureOrder odsProcureOrder);
 
     void addBatchPallet(@Param("list")List<OdsProcureOrder> dtos);
+
+    OdsProcureOrder selectOdsProcureOrderCard(OdsProcureOrder odsProcureOrder);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
index 1762aa82..db3a7362 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
@@ -115,4 +115,6 @@ public interface IOdsProcureOrderService {
     String getIdCardList(OdsProcureOrder odsProcureOrder);
 
     String getIdCardListDA(OdsProcureOrder odsProcureOrder);
+
+    OdsProcureOrder selectOrderCard(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 6921d9a4..42ea8130 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
@@ -1146,7 +1146,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                         pw.setSupplierName(order.getSupplierName());
                         pw.setUserDefined8(order.getUserDefined8());
                         pw.setUserDefined7(order.getUserDefined7());
+                        pw.setUserDefined10("0");//标识卡状态0是未收货的
                         pw.setUserDefined11(order.getUserDefined11());
+                        pw.setUserDefined4(odsProcureOrder.getID());
                         pw.setUnit(order.getUnit());
                         if(pall.compareTo(pn)<0) {//最后一托盘
                             pw.setPlanNumber(pall);
@@ -1202,6 +1204,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return resylt;
     }
 
+    @Override
+    public OdsProcureOrder selectOrderCard(OdsProcureOrder odsProcureOrder) {
+        //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        OdsProcureOrder order=  odsProcureOrderMapper.selectOdsProcureOrderCard(odsProcureOrder);
+        return order;
+    }
+
     public String dayin(  List<OdsProcureOrder> orderList) {
         // 定义请求的URL地址
         String url = dayinUrl1;
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 2a14c2ac..e8e3e833 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
@@ -38,6 +38,7 @@
         <result property="enterpriseId" column="Enterprise_Id"/>
         <result property="enterpriseCode" column="Enterprise_Code"/>
         <result property="operationNumber" column="Operation_Number"/>
+        <result property="sn" column="sn"/>
     </resultMap>
 
     <sql id="selectOdsProcureOrderVo">
@@ -48,6 +49,7 @@
         <include refid="selectOdsProcureOrderVo"/>
         <where>
             <if test="siteCode != null  and siteCode != ''">and Site_code = #{siteCode}</if>
+            <if test="ID != null  and ID != ''">and ID = #{ID}</if>
             <if test="procureCode != null  and procureCode != ''">and Procure_Code = #{procureCode}</if>
             <if test="materialCode != null  and materialCode != ''">and Material_Code    like concat('%', #{materialCode},
                 '%') </if>
@@ -432,5 +434,24 @@
             </trim>
         </foreach>
     </insert>
+    <select id="selectOdsProcureOrderCard"      resultMap="OdsProcureOrderResult">
+        SELECT
+            card.Site_code,
+            card.Procure_Code ,
+            card.Material_Code ,
+            card.Material_Desc ,
+            card.User_Defined3 ,
+            card.User_Defined4 ,
+            card.User_Defined1  sn,
+            card.Plan_Number ,
+            card.User_Defined10,
+            card.User_Defined1,
+            order_TME.User_Defined5
+        FROM
+            ods_procure_order_card card
+                LEFT JOIN ods_procure_order order_TME ON order_TME.ID= card.User_Defined4
+        WHERE
+            card.User_Defined1= #{userDefined1}
+    </select>
 </mapper>