From 7f1e8248701f6376799c149f2855e297e1f89f18 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Sun, 20 Nov 2022 18:12:16 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heai/modules/production/dao/DailyPlanMapper.java | 2 ++ .../production/service/impl/DailyPlanServiceImpl.java | 11 +++++++++-- .../resources/mapper/production/DailyPlanMapper.xml | 5 ++++- .../static/js/pda/transferWarehousing2ForHunlian.js | 9 +++++---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java index a523f04..96ee8e3 100644 --- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java +++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java @@ -311,6 +311,8 @@ public interface DailyPlanMapper { */ SfdcTimeHistData getsfdcTimeHistData(StartSeqNoData inData); + String getSeqNoSite(int seqNo); + /** * @Description 暂停派工单 * @Title updateStopWork 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 4864b59..eae42bf 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 @@ -670,7 +670,10 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override public void addSkill(WorkCenterData inData){ - + List check= dailyPlanMapper.checkWorkCenterOperatorData(inData); + if(check.size()==0){ + dailyPlanMapper.addSkill(inData); + } } @Override @@ -853,6 +856,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override public SOScheduledRoutingOutData searchSeqNo(SOScheduledRoutingOutData inData){ + inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo())); StartSeqNoData startSeqNoData=new StartSeqNoData(); startSeqNoData.setSeqNo(inData.getSeqNo()); startSeqNoData.setSite(inData.getSite()); @@ -869,6 +873,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override public void startSeqNo(StartSeqNoData inData){ + inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo())); SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData); if(sfdcTimeHistData==null){ throw new RuntimeException("派工单不存在或者结束！"); @@ -884,6 +889,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override @Transactional public void stopWork(StartSeqNoData inData){ + inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo())); SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData); if(sfdcTimeHistData==null){ throw new RuntimeException("派工单不存在或者结束！"); @@ -904,6 +910,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override @Transactional public void continueWork(StartSeqNoData inData){ + inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo())); SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData); if(sfdcTimeHistData==null){ throw new RuntimeException("派工单不存在或者结束！"); @@ -947,7 +954,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { throw new RuntimeException("派工单已关闭！"); } if(BigDecimalUtils.compareTo(saveData.getQtyReported(),new BigDecimal(0))==0){ - throw new RuntimeException("派工单已未报工无法关闭,请取消或者流转！"); + throw new RuntimeException("派工单尚未报工无法关闭,请取消或者流转！"); } dailyPlanMapper.closeSchedule(inData); } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 0f5de06..d7e3e2d 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -436,7 +436,7 @@ select top 1 Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported, 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,orderRef1) as itemDesc,orderRef1 , + dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,orderNo) as itemDesc,orderRef1 , dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,closedFlag,outWorkFlag from SOScheduledRouting where site=#{site} and SeqNo=#{seqNo} @@ -453,6 +453,9 @@ +