0412更新

src/main/java/com/heai/modules/production/dao/SOTaskOrderHeaderMapper.java

@@ -1,9 +1,8 @@
 package com.heai.modules.production.dao;
 
 
-import com.heai.modules.production.entity.DailyPlanInData;
-import com.heai.modules.production.entity.DailyReportInData;
-import com.heai.modules.production.entity.SOTaskOrderHeaderData;
+import com.heai.modules.production.entity.*;
+import com.sun.xml.internal.bind.v2.TODO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -152,4 +151,41 @@ public interface SOTaskOrderHeaderMapper {
      * @throw
      */
     int checkBomIfHas(DailyReportInData inData);
+
+    /**
+     * @Description 获取有混炼订单的明细
+     * @Title getCombineTaskNo
+      * @param site
+     * @param taskNo
+     * @author rq
+     * @date 2023/1/5 14:36
+     * @return List<HunlianTaskDetailData>
+     * @throw
+     */
+    List<HunlianTaskDetailData> getCombineTaskNo(@Param("site") String site,@Param("taskNo") String taskNo);
+
+    /**
+     * @Description 检查是否状态不一样
+     * @Title checkRepairSOFlag
+      * @param site
+     * @param taskNo
+     * @author rq
+     * @date 2023/1/5 17:12
+     * @return List<ShopOrderData>
+     * @throw
+     */
+    List<ShopOrderData> checkRepairSOFlag(@Param("site") String site,@Param("taskNo") String taskNo);
+    /**
+     * @Description 检查版本号是否一致
+     * @Title checkRev
+      * @param site
+     * @param taskNo
+     * @author rq
+     * @date 2023/1/5 17:12
+     * @return List<ShopOrderData>
+     * @throw
+     */
+
+    List<ShopOrderData> checkRev(@Param("site") String site,@Param("taskNo") String taskNo);
+    String getCombineOrderNo();
 }

src/main/java/com/heai/modules/production/entity/HunlianTaskHeaderData.java

@@ -68,7 +68,7 @@ public class HunlianTaskHeaderData {
     private Date deleteDate;
 
     private List<HunlianTaskDetailData> detailList;
-
+    private String orderRef1;
     public String getSite() {
         return site;
     }
@@ -180,5 +180,13 @@ public class HunlianTaskHeaderData {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getOrderRef1() {
+        return orderRef1;
+    }
+
+    public void setOrderRef1(String orderRef1) {
+        this.orderRef1 = orderRef1;
+    }
 }
 

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1095,6 +1095,22 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             throw new RuntimeException("与后台数据不一致，请刷新页面或者重新查询数据！");
         }
         dailyPlanMapper.updateSOTaskDispatchedFlag(detailList.get(0).getSite(),taskNo,"Y");
+        List<HunlianTaskDetailData> getCombineTaskNo=sOTaskOrderHeaderMapper.getCombineTaskNo(detailList.get(0).getSite(),taskNo);
+        if(getCombineTaskNo.size()>0){
+            //判断混炼单能否合并
+            List<ShopOrderData> checkRepairSOFlag=sOTaskOrderHeaderMapper.checkRepairSOFlag(detailList.get(0).getSite(),taskNo);
+            if(checkRepairSOFlag.size()>0){
+                throw new RuntimeException("混炼生产订单返工的与非返工的不能合并！");
+            }
+
+            //判断版本号是否一致
+            List<ShopOrderData> checkRev=sOTaskOrderHeaderMapper.checkRev(detailList.get(0).getSite(),taskNo);
+            if(checkRev.size()>0){
+                throw new RuntimeException("混炼生产订单BOM版本或者工艺路线版本不一致的不能合并！！");
+            }
+            String orderNo=sOTaskOrderHeaderMapper.getCombineOrderNo();
+
+        }
         dailyPlanMapper.saveHunlianTaskHeaderData(inData);
 
     }

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -679,8 +679,8 @@
     </update>
 
      <insert id="saveHunlianTaskHeaderData" >
-        insert into Hunlian_TaskHeader (Site,TaskNo,TaskQty,PartNo,CreateDate,CreateBy,ReportFlag,ReportQty,DeleteFlag,WareHouseFlag,WareHouseQty,Remark)
-        values(#{site},#{taskNo},#{taskQty},#{partNo},GetDate(),#{createBy},'N',0,'N','N',0,#{remark})
+        insert into Hunlian_TaskHeader (Site,TaskNo,TaskQty,PartNo,CreateDate,CreateBy,ReportFlag,ReportQty,DeleteFlag,WareHouseFlag,WareHouseQty,Remark,OrderRef1)
+        values(#{site},#{taskNo},#{taskQty},#{partNo},GetDate(),#{createBy},'N',0,'N','N',0,#{remark},#{orderRef1})
      </insert>
 
      <select id="getPartNoOnHand" resultType="com.heai.modules.production.entity.InventoryStockSearchData">

src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml

@@ -135,4 +135,25 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde
     <select id="getReportQtyByInputQty" resultType="double">
         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>
+
+       <select id="getCombineTaskNo" resultType="com.heai.modules.production.entity.HunlianTaskDetailData">
+        select Site,TaskNo,OrderNo,OrderRef1,OrderRef2,OrderQty,HunlianQty,OrderDate,PartNo,HunlianPartNo from Hunlian_TaskDetail
+        where Site=#{site} and taskNo=#{taskNo} and OrderRef2 is not null and OrderRef2 !=''
+    </select>
+      <select id="checkRepairSOFlag" resultType="com.heai.modules.production.entity.ShopOrderData">
+        select distinct RepairSOFlag from SHOPORDER where site=#{site} and orderNo in
+        ( select OrderRef2 from Hunlian_TaskDetail
+        where Site=#{site} and taskNo=#{taskNo} and OrderRef2 is not null and OrderRef2 !='')
+    </select>
+      <select id="checkRev" resultType="com.heai.modules.production.entity.ShopOrderData">
+        select distinct RoutingRevNo,BOMRevNo from SHOPORDER where site=#{site} and orderNo in
+        ( select OrderRef2 from Hunlian_TaskDetail
+        where Site=#{site} and taskNo=#{taskNo} and OrderRef2 is not null and OrderRef2 !='')
+    </select>
+
+       <select id="getCombineOrderNo" resultType="String">
+       Select  'HL'+  Right( '00000000'+ convert(VARCHAR(10),isnull( max(convert(float(8),substring(OrderNo,3,9))),0)+1),7) as PRNOs from OutWorkOrder where Site='1'
+
+	 and OrderNo like 'HL%' and E_Levels=2
+    </select>
 </mapper>