Browse Source

0412更新

master
ruanqi 3 years ago
parent
commit
6d9cb77c69
  1. 6
      src/main/java/com/heai/config/SwaggerConfig.java
  2. 19
      src/main/java/com/heai/modules/production/entity/AbnormalFeedBackData.java
  3. 2
      src/main/resources/mapper/production/AbnormalMapper.xml

6
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();
}

19
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;
}
}

2
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}
<where>

Loading…
Cancel
Save