From a8e76d04cc41d3976b8921d434160dbba638d80f Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 25 Jul 2024 10:20:31 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=89=8B=E6=8C=81=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmsToWCSmissionController.java | 14 +++++++++--
 .../wms/mapper/WmsOdsWhiteEmbryoInMapper.java |  2 ++
 .../op/wms/service/IWmsProductPutService.java |  2 ++
 .../impl/WmsProductPutServiceImpl.java        |  7 ++++++
 .../mapper/wms/WmsOdsWhiteEmbryoInMapper.xml  | 23 ++++++++++++++++++-
 5 files changed, 45 insertions(+), 3 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 c275c37f5..27fee1125 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
@@ -622,8 +622,18 @@ public class WmsToWCSmissionController {
         List<BaseEquipment> list = wmsProductPutService.selectBaseEquipmentList(baseEquipment);
         return success(list);
     }
-
-
+    //根据线体查询单子
+    @PostMapping("/listProOrderWorkorder")
+    public AjaxResult listProOrderWorkorder(@RequestBody   ProOrderWorkorder proOrderWorkorder) {
+        List<ProOrderWorkorder> list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder);
+        return success(list);
+    }
+    //保存--成品生产记录
+    @PostMapping("/finishedProductProductionRecords")
+    public AjaxResult finishedProductProductionRecords(@RequestBody   ProOrderWorkorder proOrderWorkorder) {
+        List<ProOrderWorkorder> list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder);
+        return success(list);
+    }
     /**
      * 成品自动码垛完以后，RGV 接驳要入库的托盘，扫描 RFID 号，请求 WMS 获取入库托盘信息。
      * 触发时机：扫描 RFID 编码，进行入库
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java
index 6caa7444e..a0027c6fa 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java
@@ -73,4 +73,6 @@ public interface WmsOdsWhiteEmbryoInMapper {
     WmsOdsWhiteEmbryoIn selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn);
 
     String selectByOrderAndBc(@Param("proOrderWorkorderBatch") ProOrderWorkorderBatch proOrderWorkorderBatch,@Param("orderCode")  String orderCode);
+
+    List<ProOrderWorkorder> listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
index bd910f3b9..114b75f04 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
@@ -132,4 +132,6 @@ public interface IWmsProductPutService {
     String finishedProductSalesReturnTD(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
 
     List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment);
+
+    List<ProOrderWorkorder> listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
 }
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 04b66376e..b81c59635 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
@@ -990,6 +990,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         return baseEquipments;
     }
 
+    @Override
+    public List<ProOrderWorkorder> listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
+        DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode());
+        List<ProOrderWorkorder>     workorderList= wmsOdsWhiteEmbryoInMapper.listProOrderWorkorder(proOrderWorkorder);
+        return workorderList;
+    }
+
     @Override
     public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
         DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml
index cb1a82cb2..f6c17e309 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml
@@ -285,5 +285,26 @@
         <include refid="selectWmsOdsWhiteEmbryoInVo"/>
         WHERE	Active='1'	AND	Order_Code=#{orderCode}	AND	User_Defined1=#{userDefined1}
     </select>
-
+    <select id="listProOrderWorkorder"   resultType="com.op.wms.domain.ProOrderWorkorder">
+        SELECT
+            pro_order_workorder.workorder_code_sap  AS workorderCodeSap,
+            pro_order_workorder.status    AS status,
+            pro_order_workorder_batch.batch_code    AS batchCode,
+            pro_order_workorder.product_code    AS productCode,
+            pro_order_workorder.product_name    AS productName,
+            pro_order_workorder.unit    AS unit,
+            pro_order_workorder.workorder_name  AS workorderName
+        FROM
+            pro_order_workorder
+                LEFT JOIN pro_order_workorder_batch ON pro_order_workorder_batch.workorder_id= pro_order_workorder.workorder_id
+        WHERE
+            pro_order_workorder.parent_order= '0'
+          AND pro_order_workorder_batch.del_flag= '0'
+        AND	pro_order_workorder.status	IN('w2','w3')
+        AND	pro_order_workorder.product_date= CONVERT(DATE, GETDATE())
+        <if test="workorderName != null">AND pro_order_workorder.workorder_name= #{workorderName}</if>
+        <if test="workorderCodeSap != null">AND pro_order_workorder.workorder_code_sap= #{workorderCodeSap}</if>
+        <if test="batchCode != null">AND pro_order_workorder_batch.batch_code= #{batchCode}</if>
+        <if test="productCode != null">AND pro_order_workorder.product_code= #{productCode}</if>
+    </select>
 </mapper>