0412更新

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

@@ -11,9 +11,9 @@ public class AbnormalFeedBackDataIn extends AbnormalFeedBackData {
     private Date startDate;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
 
     private String userId;
-    private Date endDate;
 
     public Date getStartDate() {
         return startDate;

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

@@ -22,6 +22,7 @@ public class DailyPlanInData implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate2;
     private String status;
+    private String taskNo;
     private String partNo;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -341,4 +342,12 @@ public class DailyPlanInData implements Serializable {
     public void setSoTaskNo(String soTaskNo) {
         this.soTaskNo = soTaskNo;
     }
+
+    public String getTaskNo() {
+        return taskNo;
+    }
+
+    public void setTaskNo(String taskNo) {
+        this.taskNo = taskNo;
+    }
 }

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

@@ -15,7 +15,7 @@ public class SOTaskOrderHeaderData {
      *
      */
     private String site;
-
+    private String taskNo;
     /**
      *
      */
@@ -505,5 +505,13 @@ public class SOTaskOrderHeaderData {
     public void setPartPlanQty(Double partPlanQty) {
         this.partPlanQty = partPlanQty;
     }
+
+    public String getTaskNo() {
+        return taskNo;
+    }
+
+    public void setTaskNo(String taskNo) {
+        this.taskNo = taskNo;
+    }
 }
 

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

@@ -85,17 +85,22 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde
     SELECT top 10000 SOT.OrderNo,SOT.Site,SOT.Status,SOT.OrderDate,SOT.OrderQty,SOT.OrderRefType,SOT.OrderRef1, CASE WHEN SOT.CloseFlag ='N' THEN '正常' ELSE '已流转' END as CloseFlag,
     SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,dbo.Get_Part_SpecDesc(SOT.Site,SOT.PartNo) PartDescription,SOT.QtyCirculation,isnull(SOT.InputQty,0)as InputQty,SOT.ReportTime
     ,Round(dbo.Get_PartWeightFactorForReport(SOT.Site,SOT.OrderNo,SOT.OrderRef1)*SOT.OrderQty,2) as weight
-    ,isnull(dbo.Get_PartPlanQty(SOT.site,SOT.PartNo,SOT.OrderRef1),0) partPlanQty
+    ,isnull(dbo.Get_PartPlanQty(SOT.site,SOT.PartNo,SOT.OrderRef1),0) partPlanQty,c.TaskNo
     FROM  SOTaskOrderHeader SOT
-
+    left join Hunlian_TaskDetail c on SOT.site=c.site and SOT.OrderNo=c.OrderNo
+    left join Hunlian_TaskHeader d on c.site=d.site and c.TaskNo=d.TaskNo
     LEFT join  Part P on P.Site= SOT.Site and P.PartNo=SOT.PartNo
 <!--    LEFT join  ShopOrder s on  s.site=SOT.Site and s.orderNo=SOT.OrderRef1-->
      <where>
+      and (d.DeleteFlag='N' or d.DeleteFlag is null)
      <if test="orderNo != null and orderNo != ''">
             AND SOT.OrderNo like #{orderNo}
         </if>
         <if test="orderRef1 != null and orderRef1 != ''">
             AND SOT.OrderRef1 like #{orderRef1}
+        </if>
+         <if test="taskNo != null and taskNo != ''">
+            AND c.TaskNo like #{taskNo}
         </if>
         <if test="partNo != null and partNo != ''">
             AND SOT.PartNo like #{partNo}
@@ -116,7 +121,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde
 
        ${sql}
     </where>
-    order by OrderDate
+    order by SOT.OrderDate
 </select>
 
     <select id="getWorkPlanDataByOrderRef1AndDate" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData" parameterType="com.heai.modules.production.entity.SOTaskOrderHeaderData">