From 948dd1a773d11657128da4908f3f2e922e765351 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Tue, 5 Mar 2024 13:03:45 +0800 Subject: [PATCH] =?UTF-8?q?24-03-05=20=E8=BF=94=E5=B7=A5=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SOScheduledRoutingOutData.java | 10 +++++++++ .../production/entity/ScheduleData.java | 13 +++++++++++ .../modules/production/entity/SfdcCancel.java | 1 + .../entity/ShopOrderRoutingData.java | 10 +++++++++ .../service/impl/DailyPlanServiceImpl.java | 7 ++++-- .../mapper/production/DailyPlanMapper.xml | 22 ++++++++++++------- 6 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java index 5f6c1c5..87c80ce 100644 --- a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java +++ b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java @@ -251,6 +251,16 @@ public class SOScheduledRoutingOutData { private Integer materSeqNo; private String previousBatchNo; + private String repairSOFlag; + + public String getRepairSOFlag() { + return repairSOFlag; + } + + public void setRepairSOFlag(String repairSOFlag) { + this.repairSOFlag = repairSOFlag; + } + public String getSite() { return site; } diff --git a/src/main/java/com/heai/modules/production/entity/ScheduleData.java b/src/main/java/com/heai/modules/production/entity/ScheduleData.java index 7a38b1c..db1fb61 100644 --- a/src/main/java/com/heai/modules/production/entity/ScheduleData.java +++ b/src/main/java/com/heai/modules/production/entity/ScheduleData.java @@ -37,8 +37,21 @@ public class ScheduleData { private String createBy; private String remark; private String jobType; + + /** + * 修复标记Y/N + */ + private String repairSOFlag; List scheduleDetail; + public String getRepairSOFlag() { + return repairSOFlag; + } + + public void setRepairSOFlag(String repairSOFlag) { + this.repairSOFlag = repairSOFlag; + } + public String getOrderNo() { return orderNo; } diff --git a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java index 3c3faa8..5ccc84e 100644 --- a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java +++ b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java @@ -57,4 +57,5 @@ public class SfdcCancel { private String acceptRemark; private String scrapRemark; private String userName; + private String repairSOFlag; } diff --git a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java index 337b07c..f86a7bb 100644 --- a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java +++ b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java @@ -67,6 +67,16 @@ public class ShopOrderRoutingData extends ShopOrderData{ private Float weightFactor; private String userId; private String equipment; + private String materialSplitFlag; + + public String getMaterialSplitFlag() { + return materialSplitFlag; + } + + public void setMaterialSplitFlag(String materialSplitFlag) { + this.materialSplitFlag = materialSplitFlag; + } + public float getItemNo() { return itemNo; } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 078e48c..92c3ce0 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -18,6 +18,7 @@ import com.heai.modules.production.util.BigDecimalUtils; import com.heai.modules.taskmanage.dto.TaskDto; import com.heai.modules.taskmanage.entity.TaskDetailEntity; import com.heai.modules.taskmanage.service.TaskListService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +30,7 @@ import java.time.LocalTime; import java.util.*; @Service +@Slf4j public class DailyPlanServiceImpl implements DailyPlanService { @Autowired private AbnormalMapper abnormalMapper; @@ -972,8 +974,8 @@ public class DailyPlanServiceImpl implements DailyPlanService { saveData.setScheduleType("生产订单派工单"); saveData.setRemark(inData.getRemark()); saveData.setJobType(inData.getScheduleDetail().get(i).getJobType()); + saveData.setRepairSOFlag(inData.getRepairSOFlag()); dailyPlanMapper.saveSchedule(saveData); - } inData.setScheduleType("生产订单派工单"); dailyPlanMapper.updateScheduleListQty(inData); @@ -984,7 +986,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Transactional public BigDecimal scheduleForSOTask(ScheduleData inData){ List checkScheduleQty=dailyPlanMapper.checkScheduleQtyForSoTask(inData); - if (checkScheduleQty.size()==0){ + if (checkScheduleQty.isEmpty()){ throw new RuntimeException("该生产订单已不存在请核实！"); } BigDecimal compQty=BigDecimalUtils.sub(checkScheduleQty.get(0).getQty(),checkScheduleQty.get(0).getScheduledQty()); @@ -1040,6 +1042,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { saveData.setOperatorId(inData.getScheduleDetail().get(i).getOperatorId()); saveData.setCreateBy(inData.getScheduleDetail().get(i).getCreateBy()); saveData.setJobType(inData.getScheduleDetail().get(i).getJobType()); + saveData.setRepairSOFlag(inData.getRepairSOFlag()); dailyPlanMapper.saveScheduleForSOTask(saveData); } inData.setScheduleType("日计划派工单"); diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index c57b415..2700698 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -227,7 +227,7 @@ order by a.WorkCenterNo,a.site - select a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,dbo.Get_PartValue(a.site,a.PartNo,'equipment') as equipment, + select a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,dbo.Get_PartValue(a.site,a.PartNo,'equipment') as equipment,so.RepairSOFlag, P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime, S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1)*a.OrderQty,2) as weight, dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1) as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty,so.needDate,cod.PlanShipDate @@ -396,21 +396,21 @@ Insert into soscheduledrouting(Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,PlanStartTime,PlanFinishTime ,BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ShiftNo,S_WorkCenterNo ,SelectedFlag,SourceFlag,ParkFlag,TimeRequired_Original,QtyRequired_Original - ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1,cancelReportFlag,CreateBy,WorkTime,stopTime,jobType) + ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1,cancelReportFlag,CreateBy,WorkTime,stopTime,jobType,RepairSOFlag) values(#{site},#{orderNo},#{itemNo},#{seqNo},#{scheduleQty},0,0,dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderNo},#{itemNo},#{scheduleQty}),0,#{scheduleDate},#{scheduleDate} ,'*',#{remark},1,'N',0,'Y',#{scheduleDate},#{resourceId},#{shiftNo},#{workCenterNo} ,'N','N','N',dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderNo},#{itemNo},#{scheduleQty}),#{scheduleQty} - ,'N','N',#{efficiency},GETDATE(),'生产订单派工单',#{operatorId},#{partNo},#{orderNo},'N',#{createBy},0,0,#{jobType}) + ,'N','N',#{efficiency},GETDATE(),'生产订单派工单',#{operatorId},#{partNo},#{orderNo},'N',#{createBy},0,0,#{jobType},#{repairSOFlag}) Insert into soscheduledrouting(Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,PlanStartTime,PlanFinishTime ,BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ShiftNo,S_WorkCenterNo ,SelectedFlag,SourceFlag,ParkFlag,TimeRequired_Original,QtyRequired_Original - ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1,cancelReportFlag,CreateBy,WorkTime,stopTime,jobType) + ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1,cancelReportFlag,CreateBy,WorkTime,stopTime,jobType,RepairSOFlag) values(#{site},#{orderRef1},#{itemNo},#{seqNo},#{scheduleQty},0,0,dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderRef1},#{itemNo},#{scheduleQty}),0,#{scheduleDate},#{scheduleDate} ,'*',#{remark},1,'N',0,'Y',#{scheduleDate},#{resourceId},#{shiftNo},#{workCenterNo} ,'N','N','N',dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderRef1},#{itemNo},#{scheduleQty}),#{scheduleQty} - ,'N','N',#{efficiency},GETDATE(),'日计划派工单',#{operatorId},#{partNo},#{orderNo},'N',#{createBy},0,0,#{jobType}) + ,'N','N',#{efficiency},GETDATE(),'日计划派工单',#{operatorId},#{partNo},#{orderNo},'N',#{createBy},0,0,#{jobType},#{repairSOFlag}) @@ -453,7 +453,7 @@ @@ -932,7 +935,7 @@ select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,a.StatisticDate, a.AssJobSeqNo,a.Scheduled_ResourceId ResourceID,b.S_ShiftNo ShiftNo,b.partNo,dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) operation_desc,c.OperatorName,b.S_ShiftNo ShiftDesc,e.ResourceDesc,Reverseflag ,a.reportWeight,a.approveWeight,a.moldQty,a.stopTime,dbo.Get_Part_Spec(a.site,b.partNo) partSpec,dbo.Get_PartDesc(a.site,b.partNo) PartDesc,wasteWeight,b.jobType, - f.Remark as scrapRemark,f.DefectQty as scrapQty,g.Remark as acceptRemark,g.DefectQty as acceptQty + f.Remark as scrapRemark,f.DefectQty as scrapQty,g.Remark as acceptRemark,g.DefectQty as acceptQty,b.RepairSOFlag from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo left join Operator c on a.site=c.site and a.OperatorID=c.OperatorID left join WorkCenterResource e on a.Site=e.Site and a.Scheduled_ResourceId =e.ResourceID and a.WorkCenterNo=e.WorkCenterNo @@ -976,6 +979,9 @@ and dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) like #{operationDesc} + + and b.RepairSOFlag like #{repairSOFlag} + order by a.ReportDate desc