diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
index 6644901..cee369d 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -67,5 +67,6 @@ public class SoReceiveCasesData extends SoReceiveCases {
+
diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
index 0c8a9b5..bbef99c 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -206,5 +206,6 @@ public class SoReceiveCases {
+
diff --git a/src/main/java/com/gaotao/modules/schedule/data/OrderBomData.java b/src/main/java/com/gaotao/modules/schedule/data/OrderBomData.java
index d62aa6a..b547404 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/OrderBomData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/OrderBomData.java
@@ -2,6 +2,7 @@ package com.gaotao.modules.schedule.data;
import org.apache.ibatis.type.Alias;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -28,6 +29,24 @@ public class OrderBomData extends BaseData {
private Float qtyReserved;
private String matGroup;
private String rmTypeDb;
+ private BigDecimal qtyReturn;
+ private BigDecimal theoryQtyReturn;
+
+ public BigDecimal getQtyReturn() {
+ return qtyReturn;
+ }
+
+ public void setQtyReturn(BigDecimal qtyReturn) {
+ this.qtyReturn = qtyReturn;
+ }
+
+ public BigDecimal getTheoryQtyReturn() {
+ return theoryQtyReturn;
+ }
+
+ public void setTheoryQtyReturn(BigDecimal theoryQtyReturn) {
+ this.theoryQtyReturn = theoryQtyReturn;
+ }
public OrderBomData() {
}
diff --git a/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java b/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java
index 3d94cce..72deee8 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java
@@ -34,6 +34,60 @@ public class SfdcMaterialData extends BaseRollData {
private String keyRMFlag;
private String sAPBOMItemNo;
private String setupflag;
+ private String finishedFlagDesc;
+ private String unissueFlagDesc;
+ private String keyRMFlagDesc;
+ private String setupFlagDesc;
+ private String partDesc;
+ private String spec;
+
+ public String getPartDesc() {
+ return partDesc;
+ }
+
+ public void setPartDesc(String partDesc) {
+ this.partDesc = partDesc;
+ }
+
+ public String getSpec() {
+ return spec;
+ }
+
+ public void setSpec(String spec) {
+ this.spec = spec;
+ }
+
+ public String getFinishedFlagDesc() {
+ return finishedFlagDesc;
+ }
+
+ public void setFinishedFlagDesc(String finishedFlagDesc) {
+ this.finishedFlagDesc = finishedFlagDesc;
+ }
+
+ public String getUnissueFlagDesc() {
+ return unissueFlagDesc;
+ }
+
+ public void setUnissueFlagDesc(String unissueFlagDesc) {
+ this.unissueFlagDesc = unissueFlagDesc;
+ }
+
+ public String getKeyRMFlagDesc() {
+ return keyRMFlagDesc;
+ }
+
+ public void setKeyRMFlagDesc(String keyRMFlagDesc) {
+ this.keyRMFlagDesc = keyRMFlagDesc;
+ }
+
+ public String getSetupFlagDesc() {
+ return setupFlagDesc;
+ }
+
+ public void setSetupFlagDesc(String setupFlagDesc) {
+ this.setupFlagDesc = setupFlagDesc;
+ }
public SfdcMaterialData() {
}
diff --git a/src/main/java/com/gaotao/modules/schedule/data/SfdcRollData.java b/src/main/java/com/gaotao/modules/schedule/data/SfdcRollData.java
index 2a03032..215072d 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SfdcRollData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SfdcRollData.java
@@ -2,6 +2,8 @@ package com.gaotao.modules.schedule.data;
import org.apache.ibatis.type.Alias;
+import java.math.BigDecimal;
+
/**
* @author LR
* @Title: SfdcRollData
@@ -27,6 +29,42 @@ public class SfdcRollData extends BaseRollData {
private String cqcPassFlag;
private String cqcInspectedFlag;
private String cqcNeedInspectFlag;
+ private Integer goodQty;
+ private Integer defectQty;
+ private Integer totalQty;
+ private BigDecimal yieldRate;
+
+ public Integer getGoodQty() {
+ return goodQty;
+ }
+
+ public void setGoodQty(Integer goodQty) {
+ this.goodQty = goodQty;
+ }
+
+ public Integer getDefectQty() {
+ return defectQty;
+ }
+
+ public void setDefectQty(Integer defectQty) {
+ this.defectQty = defectQty;
+ }
+
+ public Integer getTotalQty() {
+ return totalQty;
+ }
+
+ public void setTotalQty(Integer totalQty) {
+ this.totalQty = totalQty;
+ }
+
+ public BigDecimal getYieldRate() {
+ return yieldRate;
+ }
+
+ public void setYieldRate(BigDecimal yieldRate) {
+ this.yieldRate = yieldRate;
+ }
public SfdcRollData() {
}
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index ea100b0..e31c6f2 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -745,30 +745,32 @@