diff --git a/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java b/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java index d1d3d21..2ce2184 100644 --- a/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java +++ b/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 inData){ + scheduleService.updateSOSPrintFlag(inData); + return R.ok(); + } /** * @Description 报工使用记录 * @Title toolUseDetail diff --git a/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java b/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java index 6b5c067..d6c8505 100644 --- a/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java +++ b/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java @@ -282,4 +282,15 @@ public interface ScheduleMapper { * @throw */ List toolUseDetail(ToolOutData inData); + + /** + * @Description 修改打印标记 + * @Title updateSOSPrintFlag + * @param inData + * @author rq + * @date 2023/8/14 14:47 + * @return void + * @throw + */ + void updateSOSPrintFlag(SOScheduledRoutingOutData inData); } diff --git a/src/main/java/com/jtem/modules/Schedule/entity/SOScheduledRoutingOutData.java b/src/main/java/com/jtem/modules/Schedule/entity/SOScheduledRoutingOutData.java index 3afdaf6..3c268fb 100644 --- a/src/main/java/com/jtem/modules/Schedule/entity/SOScheduledRoutingOutData.java +++ b/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; + } } diff --git a/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java b/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java index a4605b8..4d7eecf 100644 --- a/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java +++ b/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java @@ -227,4 +227,15 @@ public interface ScheduleService { * @throw */ List toolUseDetail(ToolOutData inData); + + /** + * @Description 修改打印标记 + * @Title updateSOSPrintFlag + * @param inData + * @author rq + * @date 2023/8/14 14:47 + * @return void + * @throw + */ + void updateSOSPrintFlag(List inData); } diff --git a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java index 9cc9c59..cfaf98a 100644 --- a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java +++ b/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 inList){ + for (int i = 0; i + + 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 @@ -330,4 +330,8 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman FinishQty,useQty,moQty from SFDC_ToolingHist where SeqNo=#{seqNo} and site=#{site} + + update SOScheduledRouting set printFlag='Y' where site=#{site} and seqNo=#{seqNo} + +