0412更新

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

@@ -23,6 +23,7 @@ public class OrderViewData {
     private String finishedQty;
     private String lotSize;
     private String closedFlag;
+    private String jiagongReport;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;

src/main/java/com/heai/modules/taskmanage/vo/TaskDetailVo.java

@@ -32,7 +32,12 @@ public class TaskDetailVo {
     private Date finishEndDate;
     private String chatLastType;
     private Integer id;
-
+    private String orderRef1;
+    private String orderRef2;
+    private String orderRef3;
+    private String orderRefType;
+    private String orderRef4;
+    private String allowCloseByHand;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

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

@@ -184,6 +184,7 @@
         Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'修边'),0),3) as xiubianReport,
         Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'烘烤'),0),3) as hongkaoReport,
         Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'检验'),0),3) as jianyanReport,
+        Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'加工'),0),3) as jiagongReport,
         Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'包装'),0),3) as baozhuangReport,
         Round(FinishedQty,3) FinishedQty ,
         LotSize

src/main/resources/mapper/taskmanage/TaskDatailDao.xml

@@ -34,6 +34,8 @@
         ,( u.department + ' | ' +  u.username) as dep_user_name
         , td.task_id
         , dbo.Get_chat_LastType(td.site,td.id,td.created_by) chatLastType
+        ,tl.AllowCloseByHand,tl.OrderRef1,tl.OrderRef2,
+        tl.OrderRef3,tl.OrderRefType,tl.OrderRef4
         from task_detail td
         left join task_list tl on td.task_id = tl.id AND td.site = tl.site
         left join users u on td.site = u.site and u.userId = td.responsible_person
@@ -104,6 +106,8 @@
         ,( u.department + ' | ' +  u.username) as dep_user_name
         , td.task_id
         , dbo.Get_chat_LastType(td.site,td.id,td.created_by) chatLastType
+        ,tl.AllowCloseByHand,tl.OrderRef1,tl.OrderRef2,
+        tl.OrderRef3,tl.OrderRefType,tl.OrderRef4
         from task_detail td
         left join task_list tl on td.task_id = tl.id AND td.site = tl.site
         left join users u on td.site = u.site and u.userId = td.responsible_person