66

src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java

@@ -304,7 +304,20 @@ public class ScheduleController {
         scheduleService.toolReport(inData);
         return R.ok();
     }
-
+    /**
+     * @Description TODO
+     * @Title updateSOSPrintFlag
+     * @param inData
+     * @author rq
+     * @date 2023/8/8 14:45
+     * @return R
+     * @throw
+     */
+    @PostMapping("/updateSOSPrintFlag")
+    public R updateSOSPrintFlag(@RequestBody List<SOScheduledRoutingOutData> inData){
+        scheduleService.updateSOSPrintFlag(inData);
+        return R.ok();
+    }
     /**
      * @Description 报工使用记录
      * @Title toolUseDetail

src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java

@@ -282,4 +282,15 @@ public interface ScheduleMapper {
      * @throw
      */
     List<ToolOutData> toolUseDetail(ToolOutData inData);
+
+    /**
+     * @Description 修改打印标记
+     * @Title updateSOSPrintFlag
+     * @param inData
+     * @author rq
+     * @date 2023/8/14 14:47
+     * @return void
+     * @throw
+     */
+    void updateSOSPrintFlag(SOScheduledRoutingOutData inData);
 }

src/main/java/com/jtem/modules/Schedule/entity/SOScheduledRoutingOutData.java

@@ -39,6 +39,7 @@ public class SOScheduledRoutingOutData {
     private String batchNo;
     private String partStock;
     private String productionLineDesc;
+    private String printFlag;
     /**
      *
      */
@@ -804,5 +805,13 @@ public class SOScheduledRoutingOutData {
     public void setFirstWorkDate(Date firstWorkDate) {
         this.firstWorkDate = firstWorkDate;
     }
+
+    public String getPrintFlag() {
+        return printFlag;
+    }
+
+    public void setPrintFlag(String printFlag) {
+        this.printFlag = printFlag;
+    }
 }
 

src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java

@@ -227,4 +227,15 @@ public interface ScheduleService {
      * @throw
      */
     List<ToolOutData> toolUseDetail(ToolOutData inData);
+
+    /**
+     * @Description 修改打印标记
+     * @Title updateSOSPrintFlag
+      * @param inData
+     * @author rq
+     * @date 2023/8/14 14:47
+     * @return void
+     * @throw
+     */
+    void updateSOSPrintFlag(List<SOScheduledRoutingOutData> inData);
 }

src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java

@@ -371,4 +371,12 @@ public class ScheduleServiceImpl implements ScheduleService {
         return scheduleMapper.toolUseDetail(inData);
     }
 
+    @Override
+    @Transactional
+    public void updateSOSPrintFlag(List<SOScheduledRoutingOutData> inList){
+        for (int i = 0; i <inList.size() ; i++) {
+            scheduleMapper.updateSOSPrintFlag(inList.get(i));
+        }
+    }
+
 }

src/main/resources/mapper/board/BoardMapper.xml

@@ -97,6 +97,8 @@
     ) board
  ORDER BY resourceId
 </select>
+
+
 <select id="getRefreshTimeDefault" resultType="com.jtem.modules.board.entity.BoardConfigData">
     SELECT value FROM boardConfig_default
     WHERE type='board_refresh' AND boardName = #{boardName}

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

@@ -4,7 +4,7 @@
 
  <select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
         select   a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
-        P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
+        P.PartDescription+'/'+isnull(P.Spec,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
         S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
@@ -112,7 +112,7 @@
         S_WorkCenterNo, a.EnteredDate,a.scheduleType,a.operatorId,a.partNo,dbo.Get_Part_SpecDesc(a.Site,a.partNo) as partDesc,
         dbo.Get_OperatorDesc(a.Site,a.operatorId) as operatorName,dbo.Get_ItemDesc(a.Site,a.OrderNo,ItemNo) as itemDesc,a.orderRef1 ,
         dbo.Get_WorkCenterDesc(a.Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_SpecDesc(a.Site,a.partNo) as partSpec,a.circulation_seqNo,a.circulation_qty
-        ,dbo.Get_Part_UMID(a.Site,a.PartNo) umid,b.lotSize ,b.customerId,a.ClosedDate,a.FirstWorkDate
+        ,dbo.Get_Part_UMID(a.Site,a.PartNo) umid,b.lotSize ,b.customerId,a.ClosedDate,a.FirstWorkDate,a.printFlag
 
          from SOScheduledRouting a left join shopOrder b on a.OrderNo=b.OrderNo and a.site=b.site
 <!--          left join user_work_center uwc on a.site=uwc.site and a.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}-->
@@ -330,4 +330,8 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman
         FinishQty,useQty,moQty from SFDC_ToolingHist where SeqNo=#{seqNo} and site=#{site}
     </select>
 
+    <update id="updateSOSPrintFlag">
+        update SOScheduledRouting set printFlag='Y' where site=#{site} and seqNo=#{seqNo}
+    </update>
+
 </mapper>