diff --git a/pom.xml b/pom.xml
index 39fb256..a51c745 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,11 @@
lombok
${lombok.version}
+
+ org.springframework.boot
+ spring-boot-autoconfigure
+ 2.2.4.RELEASE
+
diff --git a/src/main/java/com/gaotao/modules/schedule/data/SfdcRollOpsData.java b/src/main/java/com/gaotao/modules/schedule/data/SfdcRollOpsData.java
index 1f8b09d..3b974a1 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SfdcRollOpsData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SfdcRollOpsData.java
@@ -14,10 +14,10 @@ import java.util.Date;
*/
@Alias("SfdcRollOpsData")
public class SfdcRollOpsData extends BaseRollData {
- private String scanBy;
+ private String scanedBy;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date scanDate;
+ private Date scanedDate;
private String startProdFlag;
private String firstSetupBy;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -60,9 +60,9 @@ public class SfdcRollOpsData extends BaseRollData {
}
//单纯插入数据
- public SfdcRollOpsData(String scanBy, Date scanDate, String startProdFlag, String pauseFlag, Float qtyReported, Float qtyDefected, String reportedFlag) {
- this.scanBy = scanBy;
- this.scanDate = scanDate;
+ public SfdcRollOpsData(String scanedBy, Date scanedDate, String startProdFlag, String pauseFlag, Float qtyReported, Float qtyDefected, String reportedFlag) {
+ this.scanedBy = scanedBy;
+ this.scanedDate = scanedDate;
this.startProdFlag = startProdFlag;
this.pauseFlag = pauseFlag;
this.qtyReported = qtyReported;
@@ -70,20 +70,20 @@ public class SfdcRollOpsData extends BaseRollData {
this.reportedFlag = reportedFlag;
}
- public String getScanBy() {
- return scanBy;
+ public String getScanedBy() {
+ return scanedBy;
}
- public void setScanBy(String scanBy) {
- this.scanBy = scanBy;
+ public void setScanedBy(String scanedBy) {
+ this.scanedBy = scanedBy;
}
- public Date getScanDate() {
- return scanDate;
+ public Date getScanedDate() {
+ return scanedDate;
}
- public void setScanDate(Date scanDate) {
- this.scanDate = scanDate;
+ public void setScanedDate(Date scanedDate) {
+ this.scanedDate = scanedDate;
}
public String getStartProdFlag() {
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 1cb7b4f..a229c68 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
@@ -660,8 +660,8 @@ public class ScheduleServiceImpl implements ScheduleService {
sfdcRollOpsData.setOrderNo(orderNo);
sfdcRollOpsData.setItemNo(itemNo);
sfdcRollOpsData.setRollNo(currentRollNo);
- sfdcRollOpsData.setScanBy(username);
- sfdcRollOpsData.setScanDate(new Date());
+ sfdcRollOpsData.setScanedBy(username);
+ sfdcRollOpsData.setScanedDate(new Date());
sfdcRollOpsData.setSeqNo(seqNo);
sfdcRollOpsData.setFinishedFlag("N");
sfdcRollOpsData.setRemark("");
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index ac02dfd..84b2ac2 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -233,7 +233,7 @@