0412更新

src/main/java/com/heai/modules/production/entity/AbnormalFeedBackData.java

@@ -35,7 +35,8 @@ public class AbnormalFeedBackData {
      *
      */
     private String feedbackBy;
-
+    private String operatorDesc;
+    private String productionLineDesc;
     /**
      *
      */
@@ -418,5 +419,21 @@ public class AbnormalFeedBackData {
     public void setAbnormalDesc(String abnormalDesc) {
         this.abnormalDesc = abnormalDesc;
     }
+
+    public String getOperatorDesc() {
+        return operatorDesc;
+    }
+
+    public void setOperatorDesc(String operatorDesc) {
+        this.operatorDesc = operatorDesc;
+    }
+
+    public String getProductionLineDesc() {
+        return productionLineDesc;
+    }
+
+    public void setProductionLineDesc(String productionLineDesc) {
+        this.productionLineDesc = productionLineDesc;
+    }
 }
 

src/main/resources/mapper/production/AbnormalMapper.xml

@@ -25,6 +25,7 @@
         select a.Site,a.OrderNo,a.SeqNo,a.AbnormalCode,b.AbnormalDesc abnormalDesc,a.AbnormalRemark,a.FeedbackBy,a.FeedbackDate,a.Status,Treatment_temporary,Temperature_temporary,
     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
     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}
@@ -45,8 +46,6 @@
             <if test="endDate != null ">
                 AND  #{endDate} >=  DATEADD(dd, -1, a.FeedbackDate)
             </if>
-
-
         </where>
         order by a.id desc
     </select>