From a71ebc8956e0af09e3b74190f37358fb88c7fb3c Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 26 Feb 2025 13:09:20 +0800 Subject: [PATCH 1/6] =?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 --- src/main/resources/mapper/production/DailyPlanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index c4f68ef..c62c712 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -902,7 +902,7 @@ LEFT JOIN Part c on b.PartNo=c.PartNo and b.site=c.site - and a.Status!='已取消' and a.ToTypeFlag_DB not in ('I','Q') + and a.Status!='已取消' and a.ToTypeFlag_DB = 'W' and TransDate >= #{startDate} From fa779ca32d3c809f6d67b5fd6d17d358c34ef6a4 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 3 Mar 2025 14:22:05 +0800 Subject: [PATCH 2/6] =?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 --- .../mapper/production/DailyPlanMapper.xml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index c62c712..139e84c 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -8,8 +8,8 @@ select a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,a.MaterialSplitFlag,a.RepairSOFlag, P.Spec+'/'+isnull(P.PartDescription,'') 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,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) weightFactor, - Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate, + S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,P.NetWeight/1000 weightFactor, + Round(isnull(P.NetWeight/1000,1)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate, dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate,Round(S.DefectiveQty,3) DefectiveQty,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi, Round((a.LotSize- S.qtyReported)/case when s.MachRunFactor=0 then 1000000 else s.MachRunFactor end ,1) lastTime ,dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) orderTypeDesc @@ -292,7 +292,8 @@ and a.E_Levels = #{eLevels} - order by a.PlanStartDate desc,s.itemNo + order by case when dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) in ('变更订单','加急订单') then 1 else 2 end , + a.PlanStartDate desc,s.itemNo update SOTaskOrderHeader set CombineTime = GetDate() where site=#{site} and orderNo=#{orderNo} @@ -366,8 +367,8 @@ select role_id from sys_user_role where user_id = #{value} + + \ No newline at end of file From e2f0ddc1d0ee56ef4350c3bb05b5e27c1bac7a98 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 6 Mar 2025 16:59:56 +0800 Subject: [PATCH 6/6] =?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 --- .../modules/production/service/impl/AbnormalServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java index d78be82..3a20c16 100644 --- a/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java @@ -157,6 +157,11 @@ public class AbnormalServiceImpl implements AbnormalService { @Override public void openFeedBack(AbnormalFeedBackDataIn inData){ + Long userId = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId(); + List checkRole=sysUserRoleDao.checkRole(userId,"('超级管理员','管理员','实验室人员')"); + if(checkRole.size()==0){ + throw new RuntimeException("只有实验室和管理员可以开启！"); + } List list=abnormalMapper.getAbnormalFeedBackById(inData); if(list.size()==0){