From a94fc2dce6506f6d1aa7f5f06cbb9b208fd0da52 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 11 Apr 2022 13:49:18 +0800
Subject: [PATCH] =?UTF-8?q?1008=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/dao/SOTaskOrderHeaderMapper.java        | 10 ++++++++++
 .../production/service/impl/DailyPlanServiceImpl.java  |  6 ++++++
 src/main/resources/mapper/board/BoardMapper.xml        |  4 ++--
 .../mapper/production/SOTaskOrderHeaderMapper.xml      |  6 ++++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/dao/SOTaskOrderHeaderMapper.java b/src/main/java/com/heai/modules/production/dao/SOTaskOrderHeaderMapper.java
index 8be53d0..63cf414 100644
--- a/src/main/java/com/heai/modules/production/dao/SOTaskOrderHeaderMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/SOTaskOrderHeaderMapper.java
@@ -142,4 +142,14 @@ public interface SOTaskOrderHeaderMapper {
      * @throw
      */
     Double getReportQtyByInputQty(DailyReportInData inData);
+    /**
+     * @Description 把输入的打料公斤数转换成订单数量
+     * @Title checkBomIfHas
+     * @param
+     * @author rq
+     * @date 2021/10/12 12:00
+     * @return Double
+     * @throw
+     */
+    int checkBomIfHas(DailyReportInData inData);
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 9a3576a..097a597 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -337,6 +337,12 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         }
 
         inData.setInputQty(inData.getReportQty());
+        //检验下BOM中有没有数据
+        int checkBom=sOTaskOrderHeaderMapper.checkBomIfHas(inData);
+        if(checkBom==0){
+            throw new RuntimeException("BOM中不存在该订单，请先维护BOM！");
+        }
+
         double newQty=sOTaskOrderHeaderMapper.getReportQtyByInputQty(inData);
         if(newQty<checkList.get(0).getOrderQty()){
             throw new RuntimeException("报工数量小于计划数量！");
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 433242e..3465cd0 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -36,10 +36,10 @@
         select OrderNo,site,PartNo,PartDescSpec,ComponentPartNo,CompPartDescSpec,SJPH1,SJPH_QtyReq1,SJPH2,SJPH_QtyReq2,QtyRequired,QtyFinished,PlanStartDate,CompOrderNo,
         FinishedFlag,erpStatus FROM view_KANBAN_SO_Hunlian_Plan
         <where>
-             <if test="sql != null ">
+            <if test="sql != null ">
                  AND  #{sql} >=   PlanStartDate
             </if>
-                <if test="orderNo != null and orderNo != ''">
+            <if test="orderNo != null and orderNo != ''">
                 AND OrderNo like #{orderNo}
             </if>
             <if test="partDescSpec != null and partDescSpec != ''">
diff --git a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
index 4028733..bfd97c6 100644
--- a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
+++ b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
@@ -127,8 +127,10 @@ SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT
     <update id="dailyPlanReportSave" parameterType="com.heai.modules.production.entity.DailyReportInData">
      update SOTaskOrderHeader SET Qtyfinished=#{reportQty},ReportTime=#{reportTime},FinishFlag='Y',ReportBy=#{reportBy} ,InputQty=#{inputQty} where OrderNo=#{orderNo} and site =#{site}
     </update>
-
+  <select id="checkBomIfHas" resultType="int">
+        select count(1) from SOBOM where OrderNo=#{orderRef1} and Site=#{site}
+    </select>
     <select id="getReportQtyByInputQty" resultType="double">
-        select top 1 round(#{reportQty}*(1 - d.ScraptFactor/100.0)/ d.QtyAssembly,1)  from SOBOM as d where d.OrderNo=#{orderRef1} and Site=#{site}
+        select top 1 round(#{reportQty}*(1 - d.ScraptFactor/100.0)/ d.QtyAssembly,1)  from SOBOM  d where d.OrderNo=#{orderRef1} and d.Site=#{site}
     </select>
 </mapper>
\ No newline at end of file