From 6d9cb77c694023f5f198c55a8c60ecb9d305da9d Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 11 Apr 2023 18:12:35 +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 --- .../java/com/heai/config/SwaggerConfig.java | 6 +++--- .../entity/AbnormalFeedBackData.java | 19 ++++++++++++++++++- .../mapper/production/AbnormalMapper.xml | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/heai/config/SwaggerConfig.java b/src/main/java/com/heai/config/SwaggerConfig.java index 4b337c0..6093803 100644 --- a/src/main/java/com/heai/config/SwaggerConfig.java +++ b/src/main/java/com/heai/config/SwaggerConfig.java @@ -39,9 +39,9 @@ public class SwaggerConfig implements WebMvcConfigurer { private ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("佘莉") - .description("gaotao-fast文档") - .termsOfServiceUrl("https://www.gaotao.io") + .title("旭捷") + .description("XJ文档") + .termsOfServiceUrl("https://www.xujie.io") .version("3.0.0") .build(); } diff --git a/src/main/java/com/heai/modules/production/entity/AbnormalFeedBackData.java b/src/main/java/com/heai/modules/production/entity/AbnormalFeedBackData.java index 57f1715..6004618 100644 --- a/src/main/java/com/heai/modules/production/entity/AbnormalFeedBackData.java +++ b/src/main/java/com/heai/modules/production/entity/AbnormalFeedBackData.java @@ -15,7 +15,8 @@ public class AbnormalFeedBackData { * */ private String orderNo; - + private String partNo; + private String partDesc; /** * */ @@ -435,5 +436,21 @@ public class AbnormalFeedBackData { public void setProductionLineDesc(String productionLineDesc) { this.productionLineDesc = productionLineDesc; } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } } diff --git a/src/main/resources/mapper/production/AbnormalMapper.xml b/src/main/resources/mapper/production/AbnormalMapper.xml index 1809f55..1713ab1 100644 --- a/src/main/resources/mapper/production/AbnormalMapper.xml +++ b/src/main/resources/mapper/production/AbnormalMapper.xml @@ -26,7 +26,7 @@ Pressure_temporary,Time_temporary,Feeding_temporary,Resource_temporary,Efficiency_temporary,Speed_temporary, Material_temporary,Mould_temporary,WorkClothes_temporary,Treatment,Temperature,Pressure,a.[Time],Feeding,a.Resource, dbo.Get_OperatorDesc(a.Site,sos.operatorId) OperatorDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,sos.S_WorkCenterNo)) ProductionLineDesc, - a.Efficiency,Speed,Material,Mould,WorkClothes,a.id from AbnormalFeedBack a left join AbnormalItem b on a.AbnormalCode=b.AbnormalCode + a.Efficiency,Speed,Material,Mould,WorkClothes,a.id,dbo.Get_Part_SpecDesc(sos.site,sos.PartNo) partDesc,sos.partNo from AbnormalFeedBack a left join AbnormalItem b on a.AbnormalCode=b.AbnormalCode left join SOScheduledRouting sos on sos.seqNo=a.seqNo left join user_work_center uwc on sos.site=uwc.site and sos.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}