From 1821f14f07b22af6f38cf6b3f6b13b8b1ddc46bd Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Thu, 20 Mar 2025 14:39:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DailyPlanController.java | 6 ++ .../production/dao/SoScheduledListMapper.java | 1 + .../production/service/DailyPlanService.java | 3 + .../service/impl/DailyPlanServiceImpl.java | 7 +- .../production/SoScheduledListMapper.xml | 88 +++++++++++++------ 5 files changed, 77 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index 522b640..3c9308d 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -1056,6 +1056,12 @@ public class DailyPlanController { PageUtils page = dailyPlanService.getLiuhuaView(data); return R.ok().put("page", page); } + @PostMapping(value="/vulcanization") + @ResponseBody + public R queryVulcanizationList(@RequestBody LiuhuaViewData data){ + List list = dailyPlanService.queryVulcanizationList(data); + return R.ok().put("rows", list); + } @PostMapping("/selectToolHist") diff --git a/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java b/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java index b19d348..7ba07a9 100644 --- a/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java +++ b/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java @@ -192,6 +192,7 @@ public interface SoScheduledListMapper { */ IPage getLiuhuaView(Page page, @Param("query") LiuhuaViewData inData); + List queryVulcanizationList(@Param("query") LiuhuaViewData inData); IPage getSfdcTimeHistQuery(Page page, @Param("query") SOScheduledRoutingOutData inData); diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java index 3d52c22..6461683 100644 --- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java @@ -754,6 +754,9 @@ public interface DailyPlanService { List getOrderView(OrderViewData inData); PageUtils getLiuhuaView(LiuhuaViewData inData); + + List queryVulcanizationList(LiuhuaViewData inData); + /** * 查询shopOrder * @param dailyPlanInData 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 1f6d74c..a17ef5b 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 @@ -688,7 +688,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { transData=dailyPlanMapper.getTransData(inData.getSite(),transNo); } updateTvBase(inData.getSite(),"",inData.getSeqNo(),inData.getOperatorId()); - if(inData.getAcceptQty()>0) { + if(inData.getAcceptQty() > 0) { Date date = DateUtil.getDateToDate(new Date(), "yyyy-MM-dd"); // TaskDto taskDto=abnormalMapper.getOriginator(); TaskDto taskDto = new TaskDto(); @@ -2033,6 +2033,11 @@ public class DailyPlanServiceImpl implements DailyPlanService { new Page(inData.getPage(), inData.getLimit()), inData); return new PageUtils(resultList); } + + @Override + public List queryVulcanizationList(LiuhuaViewData inData){ + return this.soScheduledListMapper.queryVulcanizationList(inData); + } @Override public ShopOrderData selectShopOrder(DailyPlanInData dailyPlanInData) { // if (!StringUtils.hasText(dailyPlanInData.getSite())){ diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml index d662d9a..07afc01 100644 --- a/src/main/resources/mapper/production/SoScheduledListMapper.xml +++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml @@ -224,27 +224,19 @@ Round(a.QtyRequired, 2) QtyRequired, Round(a.QtyReported, 2) QtyReported, Round(a.QtyApprove, 2) QtyApprove, - Convert(varchar(20), Convert(DECIMAL(20, 1), a.QtyReported * 100 / a.QtyRequired)) + - '%' as liuhuaWancheng, + Convert(varchar(20), Convert(DECIMAL(20, 1), a.QtyReported * 100 / a.QtyRequired)) +'%' as liuhuaWancheng, dbo.Get_seqNo_firstReportTime(a.site, a.SeqNo) firstReportDate2, S_ScheduledDate as ScheduledDate, S_ShiftNo as shiftNo, dbo.Get_OperatorDesc(a.site, a.operatorId) as operatorDesc, a.partNo, dbo.Get_Part_SpecDesc(a.site, a.partNo) partSpec, - Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '修边'), 0), 3)) + - '%' as xiubianWancheng, - Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '烘烤'), 0), 3)) + - '%' as hongkaoWancheng, - Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '检验'), 0), 3)) + - '%' as jianyanWancheng, - Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '加工'), 0), 3)) + - '%' as jiagongWancheng, - Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '包装'), 0), 3)) + - '%' as baozhuangWancheng, - (select Convert(DECIMAL(20, 2), - sum(f.QtyApprove * dbo.Get_SPBOMQtyAssembly(f.site, f.orderNo)) * 100.0 / - a.QtyReported) + Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '修边'), 0), 3)) +'%' as xiubianWancheng, + Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '烘烤'), 0), 3)) +'%' as hongkaoWancheng, + Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '检验'), 0), 3)) +'%' as jianyanWancheng, + Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '加工'), 0), 3)) +'%' as jiagongWancheng, + Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '包装'), 0), 3)) +'%' as baozhuangWancheng, + (select Convert(DECIMAL(20, 2),sum(f.QtyApprove * dbo.Get_SPBOMQtyAssembly(f.site, f.orderNo)) * 100.0 /a.QtyReported) from SOScheduledRouting f where f.materSeqNo = a.SeqNo and dbo.Get_ProductionLineDesc(f.site, dbo.Get_WorkCenter_ProLineNo(f.site, f.S_WorkCenterNo)) like @@ -252,14 +244,10 @@ and f.QtyReported > 0) as liuhuahegelv , z.TillTime as liuhuaTime, - dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '修边') as xiubianTime - , - dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '烘烤') as hongkaoTime - , - dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '检验') as jianyanTime - , - dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '加工') as jiagongTime - , + dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '修边') as xiubianTime, + dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '烘烤') as hongkaoTime, + dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '检验') as jianyanTime, + dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '加工') as jiagongTime, dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '包装') as baozhuangTime from SOScheduledRouting a left join shoporder b on a.site = b.site and a.orderNo = b.orderNo @@ -271,7 +259,7 @@ and a.partNo like #{query.partNo} - and site=#{query.site} + and a.site=#{query.site} and a.seqNo like #{query.seqNo} @@ -288,9 +276,6 @@ AND #{query.endDate} >= DATEADD(dd, -1, a.S_ScheduledDate) - - and GETDATE() >= dbo.Get_seqNo_firstReportTime(a.site, a.SeqNo) - and dbo.Get_OperatorDesc(a.site,a.operatorId) like #{query.operatorDesc} @@ -345,4 +330,53 @@ order by a.EventTime + + \ No newline at end of file