2022-06-24 派工单刀模已发 已排料 网板已发 以及相关的取消

src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java

@@ -81,6 +81,9 @@ public class ScheduleData extends BaseShopOrderData {
     private String preResourceInfo;//前道机台信息
     private Float preQtyFinished;//前道工序完成的
     private String colorStyle;//颜色样式
+    private String matIssueFlag;//排料标记
+    private String plateIssueFlag;//网版已发
+    private String toolIssueFlag;//刀模已发
 
     public ScheduleData() {
     }
@@ -492,4 +495,28 @@ public class ScheduleData extends BaseShopOrderData {
     public void setColorStyle(String colorStyle) {
         this.colorStyle = colorStyle;
     }
+
+    public String getMatIssueFlag() {
+        return matIssueFlag;
+    }
+
+    public void setMatIssueFlag(String matIssueFlag) {
+        this.matIssueFlag = matIssueFlag;
+    }
+
+    public String getPlateIssueFlag() {
+        return plateIssueFlag;
+    }
+
+    public void setPlateIssueFlag(String plateIssueFlag) {
+        this.plateIssueFlag = plateIssueFlag;
+    }
+
+    public String getToolIssueFlag() {
+        return toolIssueFlag;
+    }
+
+    public void setToolIssueFlag(String toolIssueFlag) {
+        this.toolIssueFlag = toolIssueFlag;
+    }
 }

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -149,6 +149,9 @@ public class SearchScheduleData extends BaseData {
     private String oriPartNo;//原物料编码
     private String status;//状态
     private String userDisplay;//用户的名称
+    private String matIssueFlag;//排料标记
+    private String plateIssueFlag;//网版已发
+    private String toolIssueFlag;//刀模已发
 
     private int rollCount;
 
@@ -1066,4 +1069,28 @@ public class SearchScheduleData extends BaseData {
     public void setUserDisplay(String userDisplay) {
         this.userDisplay = userDisplay;
     }
+
+    public String getMatIssueFlag() {
+        return matIssueFlag;
+    }
+
+    public void setMatIssueFlag(String matIssueFlag) {
+        this.matIssueFlag = matIssueFlag;
+    }
+
+    public String getPlateIssueFlag() {
+        return plateIssueFlag;
+    }
+
+    public void setPlateIssueFlag(String plateIssueFlag) {
+        this.plateIssueFlag = plateIssueFlag;
+    }
+
+    public String getToolIssueFlag() {
+        return toolIssueFlag;
+    }
+
+    public void setToolIssueFlag(String toolIssueFlag) {
+        this.toolIssueFlag = toolIssueFlag;
+    }
 }

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -570,4 +570,31 @@ public interface ScheduleMapper {
      * @return java.lang.Float
      **/
     Float getCRollReportedQty(SearchScheduleData inData);
+
+    /**
+     * TODO 派工单排料和取消排料使用
+     * @author LR
+     * @date 2022/6/24 13:12
+     * @Param [inData]
+     * @return void
+     **/
+    void updateSoScheduledRoutingMatIssueFlag(SearchScheduleData inData);
+
+    /**
+     * TODO 派工单刀模已发和取消到刀模已发使用
+     * @author LR
+     * @date 2022/6/24 13:25
+     * @Param [inData]
+     * @return void
+     **/
+    void updateSoScheduledRoutingToolIssueFlag(SearchScheduleData inData);
+
+    /**
+     * TODO 派工单网版已发和取消到网版已发使用
+     * @author LR
+     * @date 2022/6/24 14:07
+     * @Param [inData]
+     * @return void
+     **/
+    void updateSoScheduledRoutingPlateIssueFlag(SearchScheduleData inData);
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -4180,22 +4180,25 @@ public class ScheduleServiceImpl implements ScheduleService {
     @Override
     @Transactional
     public void costRollUpProduceOrder(SearchScheduleData inData) {
-        scheduleMapper.costRollUpProduceOrder(inData);
-        scheduleMapper.insertShopOrderChangeHist(inData);
+        //scheduleMapper.costRollUpProduceOrder(inData);
+        //scheduleMapper.insertShopOrderChangeHist(inData);
+        scheduleMapper.updateSoScheduledRoutingMatIssueFlag(inData);
     }
 
     @Override
     @Transactional
     public void manualProduceOrder(SearchScheduleData inData) {
-        scheduleMapper.manualProduceOrder(inData);
-        scheduleMapper.insertShopOrderChangeHist(inData);
+        //scheduleMapper.manualProduceOrder(inData);
+       // scheduleMapper.insertShopOrderChangeHist(inData);
+        scheduleMapper.updateSoScheduledRoutingToolIssueFlag(inData);
     }
 
     @Override
     @Transactional
     public void repairSOFlagProduceOrder(SearchScheduleData inData) {
-        scheduleMapper.repairSOFlagProduceOrder(inData);
-        scheduleMapper.insertShopOrderChangeHist(inData);
+        //scheduleMapper.repairSOFlagProduceOrder(inData);
+        //scheduleMapper.insertShopOrderChangeHist(inData);
+        scheduleMapper.updateSoScheduledRoutingPlateIssueFlag(inData);
     }
 
     @Override

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -181,7 +181,7 @@
         dbo.Get_SOOpsPreResourceInfo(T.Site, T.OrderNo, T.ItemNo) preResourceInfo, dbo.Get_SOOpsPreQtyFinished(T.Site, T.OrderNo, T.ItemNo) preQtyFinished,
         P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, dbo.Get_WorkCenterDesc(T.Site, T.S_WorkCenterNo) workCenterDesc,
         T.QtyRequired_Original qtyRequiredOriginal, SO.orderType,
-        T.ClosedBy closedBy, T.ClosedDate closedDate, SO.CostRollUpFlag costRollUpFlag, SO.RepairSOFlag repairSOFlag, SO.ManualFlag manualFlag
+        T.ClosedBy closedBy, T.ClosedDate closedDate, T.mat_issueflag matIssueFlag, T.plate_issueflag plateIssueFlag, T.tool_issueflag toolIssueFlag
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo,
         SORouting as D,Part as P,ShopOrder as SO
@@ -1215,4 +1215,21 @@
         </where>
     </select>
 
+    <!--修改派工单的排料标记-->
+    <update id="updateSoScheduledRoutingMatIssueFlag"  parameterType="SearchScheduleData">
+        UPDATE SOScheduledRouting SET mat_issueflag = #{matIssueFlag} WHERE Site = #{site} AND OrderNo = #{orderNo} AND SeqNo = #{seqNo}
+    </update>
+
+    <!--修改派工单的网版标记-->
+    <update id="updateSoScheduledRoutingPlateIssueFlag"  parameterType="SearchScheduleData">
+        UPDATE SOScheduledRouting SET plate_issueflag = #{plateIssueFlag} WHERE Site = #{site} AND OrderNo = #{orderNo} AND SeqNo = #{seqNo}
+    </update>
+
+    <!--修改派工单的刀模标记-->
+    <update id="updateSoScheduledRoutingToolIssueFlag"  parameterType="SearchScheduleData">
+        UPDATE SOScheduledRouting SET tool_issueflag = #{toolIssueFlag} WHERE Site = #{site} AND OrderNo = #{orderNo} AND SeqNo = #{seqNo}
+    </update>
+
+
+
 </mapper>