11

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

@@ -2,7 +2,7 @@ package com.heai.modules.production.entity;
 
 import lombok.Data;
 
-@Data
+
 public class CardPrintData {
     private String site;
     private String taskNo;
@@ -10,4 +10,52 @@ public class CardPrintData {
     private String createDate;
     private Integer seqNo;
     private String sScheduledDate;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getTaskNo() {
+        return taskNo;
+    }
+
+    public void setTaskNo(String taskNo) {
+        this.taskNo = taskNo;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getSeqNo() {
+        return seqNo;
+    }
+
+    public void setSeqNo(Integer seqNo) {
+        this.seqNo = seqNo;
+    }
+
+    public String getsScheduledDate() {
+        return sScheduledDate;
+    }
+
+    public void setsScheduledDate(String sScheduledDate) {
+        this.sScheduledDate = sScheduledDate;
+    }
 }

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

@@ -17,7 +17,7 @@ public class SfdcCancel {
     private String partNo;
     private String workCenterNo;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date reportDate;
     private String operatorId;
     private String operatorName;
@@ -36,6 +36,9 @@ public class SfdcCancel {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date statisticDate;
     private String reverseflag;
     private String partDesc;
 }

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1150,7 +1150,6 @@ public class DailyPlanServiceImpl implements DailyPlanService {
 
         params.add(inData.getPartNo());
 
-        params.add(inData.getSScheduledDate());
         List<Map<String, Object>> resultList = functionMapper.getProcedureData("get_LiuHua_printData", params);
         return resultList;
     }

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

@@ -795,7 +795,7 @@
     </delete>
 
      <select id="getSfdcList" resultType="com.heai.modules.production.entity.SfdcCancel">
-            select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,
+            select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,a.StatisticDate,
         a.AssJobSeqNo,a.Scheduled_ResourceId  ResourceID,b.S_ShiftNo ShiftNo,b.partNo,dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) operation_desc,c.OperatorName,b.S_ShiftNo ShiftDesc,e.ResourceDesc,Reverseflag
         from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo
         left join Operator c on a.site=c.site and a.OperatorID=c.OperatorID