From 162c2cf9a701f4679a1c7d22949dad2aae8bf1e8 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 15 Feb 2023 13:23:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=8F=90=E7=A4=BA=202023?=
 =?UTF-8?q?=E5=B9=B42=E6=9C=8815=E6=97=A5=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java       | 6 +++---
 .../gaotao/modules/shopOrder/dao/ShopOrderMapper.java    | 9 +++++++++
 .../shopOrder/service/Impl/ShopOrderServiceImpl.java     | 3 +++
 src/main/resources/mapper/shopOrder/ShopOrderMapper.xml  | 9 +++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 505b51d..1d70192 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -1478,7 +1478,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         String toolCode = String.valueOf(materialMap.get("resultCode"));
         if (!"200".equalsIgnoreCase(toolCode)) {
             String toolMsg = String.valueOf(toolMap.get("resultMsg"));
-            String objectId = String.valueOf(materialMap.get("objectId"));
+            String objectId = String.valueOf(toolMap.get("objectId"));
             throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId);
         }
 
@@ -2025,7 +2025,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         String toolCode = String.valueOf(toolMap.get("resultCode"));
         if (!"200".equalsIgnoreCase(toolCode)) {
             String toolMsg = String.valueOf(toolMap.get("resultMsg"));
-            String objectId = String.valueOf(materialMap.get("objectId"));
+            String objectId = String.valueOf(toolMap.get("objectId"));
             throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId);
         }
 
@@ -3583,7 +3583,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         String toolCode = String.valueOf(toolMap.get("resultCode"));
         if (!"200".equalsIgnoreCase(toolCode)) {
             String toolMsg = String.valueOf(toolMap.get("resultMsg"));
-            String objectId = String.valueOf(materialMap.get("objectId"));
+            String objectId = String.valueOf(toolMap.get("objectId"));
             throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId);
         }
 
diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
index 90e3fad..5d1f9ef 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
@@ -5,6 +5,7 @@ import com.gaotao.modules.schedule.data.SearchScheduleData;
 import com.gaotao.modules.shopOrder.entity.*;
 import com.gaotao.modules.shopOrder.entity.vo.WorkCenterVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
@@ -316,5 +317,13 @@ public interface ShopOrderMapper {
     List<ShopOrderToolData> getShopOrderToolDatas(SearchScheduleData inData);
 
 
+    /**
+     * @author: sxm
+     * @description: 获取工单数量
+     * @param [site, orderNo]
+     * @return: java.lang.Double
+     * @date: 2023/2/14 17:36
+     */
+    Double getOrderQtyRequired(@Param("site") String site,@Param("orderNo")  String orderNo);
 
 }
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
index cfdca5f..4b19033 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
@@ -380,6 +380,9 @@ public class ShopOrderServiceImpl implements ShopOrderService {
 
     @Override
     public void insertRouteInShopOrder(RouteInShopOrderData routeInShopOrderData) {
+        // 获取工单数量
+        Double qtyRequired = shopOrderMapper.getOrderQtyRequired(routeInShopOrderData.getSite(),routeInShopOrderData.getOrderNo());
+        routeInShopOrderData.setQtyRequired(qtyRequired);
         shopOrderMapper.insertRouteInShopOrder(routeInShopOrderData);
     }
 
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index da33015..b3f7f21 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -347,13 +347,13 @@
                                TimeReported, Efficiency, PlanStartTime,
                                PlanFinishTime, BarcodeID, Remark,
                                PartNo, Crewsize, ClosedFlag,
-                               ActionNotes)
+                               ActionNotes,QtyScheduled)
         values (#{site}, #{orderNo}, #{itemNo}, #{operationDesc}, #{workCenterNo}, #{machSetupTime}, #{machRunFactor},
                 #{factorUnit_DB},
                 #{factorUnit}, #{qtyRequired}, #{qtyReported}, #{qtyApprove}, #{timeRequired}, #{timeReported},
                 #{efficiency},
                 #{planStartTime}, #{planFinishTime}, #{barcodeID}, #{remark}, #{partNo}, #{crewsize}, #{closedFlag},
-                #{actionNotes})
+                #{actionNotes},0)
 
     </insert>
 
@@ -539,6 +539,11 @@
           and T.OrderNo = #{orderNo}
         Order by ItemNo, T.ToolID
     </select>
+    <select id="getOrderQtyRequired" resultType="java.lang.Double">
+        Select LotSize
+        from ShopOrder
+        Where Site = #{site} and OrderNo = #{orderNo}
+    </select>
 
 
 </mapper>
\ No newline at end of file