From 1f8b50934e229abb07d6ea8026b20b64b33f370c Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 1 Feb 2024 15:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/Schedule/dao/ScheduleMapper.java | 34 +++ .../Schedule/entity/SfdcTimeHistData.java | 287 ++++++++++++++++++ .../service/impl/ScheduleServiceImpl.java | 15 +- .../entity/SOTaskOrderHeaderData.java | 9 + .../resources/mapper/board/BoardMapper.xml | 2 +- .../resources/mapper/pda/PdaOrderMapper.xml | 2 +- .../mapper/production/DailyPlanMapper.xml | 22 +- .../mapper/schedule/ScheduleMapper.xml | 31 +- 8 files changed, 382 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/jianteng/modules/Schedule/entity/SfdcTimeHistData.java diff --git a/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java b/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java index 96c5b84..f05461d 100644 --- a/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java +++ b/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java @@ -421,4 +421,38 @@ public interface ScheduleMapper { void updatePreviousSOSData(@Param("seqNo") Integer seqNo,@Param("previousSeqNo") Integer previousSeqNo); + + /** + * @Description TODO + * @Title getsfdcTimeHistData + * @param + * @author rq + * @date 2022/9/20 18:08 + * @return SfdcTimeHistData + * @throw + */ + SfdcTimeHistData getsfdcTimeHistData(StartSeqNoData inData); + /** + * @Description 查询有没有开始过了 + * @Title checkSfdcTimeHistData + * @param + * @author rq + * @date 2022/9/20 18:08 + * @return SfdcTimeHistData + * @throw + */ + List checkSfdcTimeHistData(StartSeqNoData inData); + + /** + * @Description 保存开始生产 + * @Title saveSfdcTimeHistDataStart + * @param + * @author rq + * @date 2022/9/20 18:08 + * @return SfdcTimeHistData + * @throw + */ + void saveSfdcTimeHistDataStart(SfdcTimeHistData inData); + + Integer getHistSeqNo(StartSeqNoData inData); } diff --git a/src/main/java/com/jianteng/modules/Schedule/entity/SfdcTimeHistData.java b/src/main/java/com/jianteng/modules/Schedule/entity/SfdcTimeHistData.java new file mode 100644 index 0000000..7a43250 --- /dev/null +++ b/src/main/java/com/jianteng/modules/Schedule/entity/SfdcTimeHistData.java @@ -0,0 +1,287 @@ +package com.jianteng.modules.Schedule.entity; + +import org.apache.ibatis.type.Alias; + +import java.util.Date; +@Alias("SfdcTimeHistData") +public class SfdcTimeHistData { + /** + * + */ + private String site; + private String abnormalCode; + private String abnormalRemark; + /** + * + */ + private String orderNo; + + /** + * + */ + private Double itemNo; + + /** + * + */ + private Integer seqNo; + + /** + * + */ + private Integer histSeqNo; + + /** + * + */ + private Date eventTime; + + /** + * + */ + private String enteredby; + + /** + * + */ + private String eventDesc; + + /** + * + */ + private String downtimeCode; + + /** + * + */ + private String eventType; + + /** + * + */ + private Integer linkHistSeqNo; + + /** + * + */ + private Date tillTime; + + /** + * + */ + private Date tillEnteredTime; + + /** + * + */ + private String tillEnteredBy; + + /** + * + */ + private String completedFlag; + + /** + * + */ + private Double totalTime; + + /** + * + */ + private String downtimePhaseIn; + + /** + * + */ + private String rollNo; + private String closedFlag; + private String outWorkFlag; + + private Date lastStartTime; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Double getItemNo() { + return itemNo; + } + + public void setItemNo(Double itemNo) { + this.itemNo = itemNo; + } + + public Integer getSeqNo() { + return seqNo; + } + + public void setSeqNo(Integer seqNo) { + this.seqNo = seqNo; + } + + public Integer getHistSeqNo() { + return histSeqNo; + } + + public void setHistSeqNo(Integer histSeqNo) { + this.histSeqNo = histSeqNo; + } + + public Date getEventTime() { + return eventTime; + } + + public void setEventTime(Date eventTime) { + this.eventTime = eventTime; + } + + public String getEnteredby() { + return enteredby; + } + + public void setEnteredby(String enteredby) { + this.enteredby = enteredby; + } + + public String getEventDesc() { + return eventDesc; + } + + public void setEventDesc(String eventDesc) { + this.eventDesc = eventDesc; + } + + public String getDowntimeCode() { + return downtimeCode; + } + + public void setDowntimeCode(String downtimeCode) { + this.downtimeCode = downtimeCode; + } + + public String getEventType() { + return eventType; + } + + public void setEventType(String eventType) { + this.eventType = eventType; + } + + public Integer getLinkHistSeqNo() { + return linkHistSeqNo; + } + + public void setLinkHistSeqNo(Integer linkHistSeqNo) { + this.linkHistSeqNo = linkHistSeqNo; + } + + public Date getTillTime() { + return tillTime; + } + + public void setTillTime(Date tillTime) { + this.tillTime = tillTime; + } + + public Date getTillEnteredTime() { + return tillEnteredTime; + } + + public void setTillEnteredTime(Date tillEnteredTime) { + this.tillEnteredTime = tillEnteredTime; + } + + public String getTillEnteredBy() { + return tillEnteredBy; + } + + public void setTillEnteredBy(String tillEnteredBy) { + this.tillEnteredBy = tillEnteredBy; + } + + public String getCompletedFlag() { + return completedFlag; + } + + public void setCompletedFlag(String completedFlag) { + this.completedFlag = completedFlag; + } + + public Double getTotalTime() { + return totalTime; + } + + public void setTotalTime(Double totalTime) { + this.totalTime = totalTime; + } + + public String getDowntimePhaseIn() { + return downtimePhaseIn; + } + + public void setDowntimePhaseIn(String downtimePhaseIn) { + this.downtimePhaseIn = downtimePhaseIn; + } + + public String getRollNo() { + return rollNo; + } + + public void setRollNo(String rollNo) { + this.rollNo = rollNo; + } + + public String getClosedFlag() { + return closedFlag; + } + + public void setClosedFlag(String closedFlag) { + this.closedFlag = closedFlag; + } + + public String getOutWorkFlag() { + return outWorkFlag; + } + + public void setOutWorkFlag(String outWorkFlag) { + this.outWorkFlag = outWorkFlag; + } + + public String getAbnormalCode() { + return abnormalCode; + } + + public void setAbnormalCode(String abnormalCode) { + this.abnormalCode = abnormalCode; + } + + public String getAbnormalRemark() { + return abnormalRemark; + } + + public void setAbnormalRemark(String abnormalRemark) { + this.abnormalRemark = abnormalRemark; + } + + public Date getLastStartTime() { + return lastStartTime; + } + + public void setLastStartTime(Date lastStartTime) { + this.lastStartTime = lastStartTime; + } +} + diff --git a/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java index b72638f..c433717 100644 --- a/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java @@ -260,8 +260,9 @@ public class ScheduleServiceImpl implements ScheduleService { public void startSeqNo(StartSeqNoData inData){ SOScheduledRoutingOutData soScheduledRoutingOutData=new SOScheduledRoutingOutData(); soScheduledRoutingOutData.setSeqNo(inData.getSeqNo()); - soScheduledRoutingOutData.setSite(inData.getSite()); + // soScheduledRoutingOutData.setSite(inData.getSite()); SOScheduledRoutingOutData result =scheduleMapper.searchSeqNo(soScheduledRoutingOutData); + inData.setSite(result.getSite()); if(result==null){ throw new RuntimeException("派工单号不存在!"); } @@ -305,6 +306,18 @@ public class ScheduleServiceImpl implements ScheduleService { } //----------检查下前道工序是否报工-----------------end + //登记开工 + SfdcTimeHistData sfdcTimeHistData=scheduleMapper.getsfdcTimeHistData(inData); + if(sfdcTimeHistData==null){ + throw new RuntimeException("派工单不存在或者结束!"); + } + List checkSfdcTimeHistData =scheduleMapper.checkSfdcTimeHistData(inData); + if(checkSfdcTimeHistData.size()>0){ + throw new RuntimeException("派工单已经开始生产无需再次开始!"); + } + Integer histSeqNo=scheduleMapper.getHistSeqNo(inData); + sfdcTimeHistData.setHistSeqNo(histSeqNo); + scheduleMapper.saveSfdcTimeHistDataStart(sfdcTimeHistData); scheduleMapper.updateOutWorkFlag(soScheduledRoutingOutData); scheduleMapper.updateFirstWorkDate(soScheduledRoutingOutData); diff --git a/src/main/java/com/jianteng/modules/production/entity/SOTaskOrderHeaderData.java b/src/main/java/com/jianteng/modules/production/entity/SOTaskOrderHeaderData.java index c9e3b6f..ccce5b7 100644 --- a/src/main/java/com/jianteng/modules/production/entity/SOTaskOrderHeaderData.java +++ b/src/main/java/com/jianteng/modules/production/entity/SOTaskOrderHeaderData.java @@ -169,6 +169,7 @@ public class SOTaskOrderHeaderData { private Double weightFactor; private Double partPlanQty; + private String finishFlag; public String getOrderNo() { return orderNo; } @@ -506,5 +507,13 @@ public class SOTaskOrderHeaderData { public void setPartPlanQty(Double partPlanQty) { this.partPlanQty = partPlanQty; } + + public String getFinishFlag() { + return finishFlag; + } + + public void setFinishFlag(String finishFlag) { + this.finishFlag = finishFlag; + } } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 9c9ced9..c4ea5d7 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -8,7 +8,7 @@ a.S_WorkCenterNo,a.mat_issueflag,a.partNo,b.QtyRequired lastRequireQty,b.QtyReported lastReportQty, dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(b.site,b.WorkCenterNo)) lastLineName, dbo.get_lastStartingSeqNo(a.Site,a.OrderNo,a.ItemNo) lastSeqNoDoing - from SOScheduledRouting a left join SORouting b on a.Site=b.Site and a.OrderNo=b.OrderNo + from SOScheduledRouting a left join v_SORouting b on a.Site=b.Site and a.OrderNo=b.OrderNo and b.ItemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.Site,a.OrderNo,a.ItemNo) and a.ClosedFlag='N' diff --git a/src/main/resources/mapper/pda/PdaOrderMapper.xml b/src/main/resources/mapper/pda/PdaOrderMapper.xml index 5896dd2..9cce827 100644 --- a/src/main/resources/mapper/pda/PdaOrderMapper.xml +++ b/src/main/resources/mapper/pda/PdaOrderMapper.xml @@ -6,7 +6,7 @@ - INSERT INTO SOTaskOrderHeader (OrderNo,Site,OrderDate,PlanStartDate,OrderQty,UserName,EnterDate,OrderRefType,OrderRef1,Qtyfinished,QtyFinished_Ontime,IssueStatus,ReceiveStatus,POCreatedFlag,LastUpdatedBy,LastUpdatedDate,PartNo,PRCreatedFlag,Status,CloseFlag,QtyCirculation,InputQty,Version) - VALUES (#{orderNo},#{site},#{orderDate},#{planStartDate},#{orderQty,jdbcType=DOUBLE},#{userName},#{enterDate},#{orderRefType},#{planOrderNo},0,0,'','','N',#{userName},#{enterDate},#{partNo},Null,'已计划','N',0,0,0) + INSERT INTO SOTaskOrderHeader (OrderNo,Site,OrderDate,PlanStartDate,OrderQty,UserName,EnterDate,OrderRefType,OrderRef1,Qtyfinished,QtyFinished_Ontime,IssueStatus,ReceiveStatus,POCreatedFlag,LastUpdatedBy,LastUpdatedDate,PartNo,PRCreatedFlag,Status,CloseFlag,QtyCirculation,InputQty,Version,FinishFlag) + VALUES (#{orderNo},#{site},#{orderDate},#{planStartDate},#{orderQty,jdbcType=DOUBLE},#{userName},#{enterDate},#{orderRefType},#{planOrderNo},0,0,'','','N',#{userName},#{enterDate},#{partNo},Null,'已计划','N',0,0,0,'N') SELECT top 10000 SOT.OrderNo,SOT.Site,SOT.Status,SOT.OrderDate,SOT.OrderQty,SOT.OrderRefType,SOT.OrderRef1, CASE WHEN SOT.CloseFlag ='N' THEN '正常' ELSE '已流转' END as CloseFlag, SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,dbo.Get_Part_SpecDesc(SOT.Site,SOT.PartNo) PartDescription,SOT.QtyCirculation,isnull(SOT.InputQty,0)as InputQty,SOT.ReportTime + ,finishFlag FROM SOTaskOrderHeader SOT @@ -229,7 +230,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde so.needDate,dbo.Get_WorkCenterDesc( a.site,s.workCenterNo) WorkCenterDesc FROM SOTaskOrderHeader a LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site - LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1 + LEFT JOIN v_SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1 LEFT JOIN ScheduleList SL on S.site=SL.site and a.OrderNo=SL.orderNo and S.ItemNo=SL.ItemNo LEFT JOIN ShopOrder so on a.OrderRef1=so.OrderNo and a.site=so.site @@ -317,12 +318,15 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde - select top 1 isnull(TotalFinishedQty,0) lastApproveQty from SORouting where Site=#{site} and OrderNo=#{orderNo} and itemNo=dbo.Get_SORouting_PreviousOperationItemNo(#{site},#{orderNo},#{itemNo}) + select top 1 isnull(TotalFinishedQty,0) lastApproveQty from v_SORouting where Site=#{site} and OrderNo=#{orderNo} and itemNo=dbo.Get_SORouting_PreviousOperationItemNo(#{site},#{orderNo},#{itemNo}) - select top 1 isnull(a.QtyReported,0) QtyReported,isnull(SOP.TotalFinishedQty,0) lastApproveQty - from SORouting a + select top 1 isnull(a.QtyReported,0) QtyReported,dbo.Get_sfdcReportedSetupTime(#{site},#{seqNo}) as timeReported,isnull(SOP.TotalFinishedQty,0) lastApproveQty + from v_SORouting a LEFT JOIN SORoutingOutput SOP ON a.site=SOP.site and a.OrderNo=SOP.OrderNo and SOP.itemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.site,a.OrderNo,a.itemNo) where a.Site=#{site} and a.OrderNo=#{orderNo} and a.itemNo=#{itemNo} @@ -220,12 +220,12 @@ BarcodeID,Remark,Crewsize,ClosedFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo, S_WorkCenterNo, EnteredDate,scheduleType,operatorId,partNo,dbo.Get_PartDesc(Site,partNo) as partDesc, dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,orderNo,ItemNo) as itemDesc,orderRef1 , - dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_SpecDesc(Site,partNo) as partSpec,closedFlag,outWorkFlag,ParkFlag,CancelReportFlag + dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_SpecDesc(Site,partNo) as partSpec,closedFlag,outWorkFlag,ParkFlag,CancelReportFlag,previousSeqNo from SOScheduledRouting where SeqNo=#{seqNo} @@ -409,7 +409,7 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman + select top 1 site,OrderNo,ItemNo,SeqNo,#{username} as Enteredby ,ClosedFlag,OutWorkFlag from SOScheduledRouting where SeqNo=#{seqNo} and ClosedFlag='N' + + + + insert into SFDC_TimeHist (Site,OrderNo,ItemNo,SeqNo,HistSeqNo,EventTime,Enteredby,EventDesc,DowntimeCode,EventType,LinkHistSeqNo,TillTime,TillEnteredTime, + TillEnteredBy,CompletedFlag,TotalTime,DowntimePhaseIn,RollNo,LastStartTime) values + (#{site},#{orderNo},#{itemNo},#{seqNo},#{histSeqNo},GetDate(),#{enteredby},'开始生产','','P',null,null,null,null,'N',0,'','*',null) + + +