From 4549d146a24d1e4c0925e10690d4ccecdf2bfcee Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 6 Apr 2022 18:45:01 +0800
Subject: [PATCH] repackage 2022-04-06 sxm

---
 .../gaotao/modules/schedule/data/SearchScheduleData.java    | 6 +++---
 .../modules/schedule/service/impl/ScheduleServiceImpl.java  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
index 8021353..4b19061 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
@@ -137,7 +137,7 @@ public class SearchScheduleData extends BaseData {
     private String repairSOFlag; // 印版已发状态
     private Double qtytoSchedule; // 排产数量
     private Double timeRequired;  // 预计重检时长
-    private boolean directRepackageflag; // 是否是换包装
+    private String directRepackageflag; // 是否是换包装
     private String sortField;//排序规则
 
     private Double rollCount;
@@ -150,11 +150,11 @@ public class SearchScheduleData extends BaseData {
         this.rollCount = rollCount;
     }
 
-    public boolean isDirectRepackageflag() {
+    public String isDirectRepackageflag() {
         return directRepackageflag;
     }
 
-    public void setDirectRepackageflag(boolean directRepackageflag) {
+    public void setDirectRepackageflag(String directRepackageflag) {
         this.directRepackageflag = directRepackageflag;
     }
 
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 8e5990f..be2de81 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -4273,6 +4273,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(scheduleData.getSeqNo());
         params.add(scheduleData.getRollNo());
         params.add(scheduleData.isDirectRepackageflag());
+        params.add(scheduleData.getShiftNo());
+        params.add(scheduleData.getScheduledDate());
         return workbenchCreateslittingrollFqcCheck("switchroll_repack_check",params);
     }
 
@@ -4300,7 +4302,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(scheduleData.getWorkCenterNo());
         params.add(scheduleData.getResourceId());
         params.add(scheduleData.getShiftNo());
-        params.add(scheduleData.getScheduleDate());
+        params.add(scheduleData.getScheduledDate());
         workbenchCreateslittingrollFqcCheck("switchroll_repack_action",params);
     }