diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
index 3724dec..1b05b57 100644
--- a/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
+++ b/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
@@ -75,6 +75,7 @@ public class SAPPutStorageServiceImpl implements ISAPPutStorageService {
materialInfo.setPlantCode(map.get("WERKS"));
materialInfo.setMaterialUnit(map.get("MEINS"));
materialInfo.setMaterialMatkl(map.get("MATKL"));
+ materialInfo.setDISPO(map.get("DISPO"));
materialInfo.setIncrementDate(DateUtils.dateTime(DateUtils.YYYY_MM_DD,map.get("UDATE")));
baseMaterialInfoService.insertBaseMaterialInfo(materialInfo);
baseMaterialInfoArrayList.add(materialInfo);
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
index b4edb77..8623da2 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
@@ -99,6 +99,18 @@ public class BaseMaterialInfo extends BaseEntity
@Excel(name = "增量日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date incrementDate;
+ /** SAP计划员（100=成品;200=箱体;300=门体） */
+ @Excel(name = "SAP计划员")
+ private String DISPO;
+
+ public String getDISPO() {
+ return DISPO;
+ }
+
+ public void setDISPO(String DISPO) {
+ this.DISPO = DISPO;
+ }
+
public Date getIncrementDate() {
return incrementDate;
}
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
index e078349..1830da1 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
@@ -71,6 +71,12 @@ public class BaseTeamMembers extends BaseEntity {
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createdTime;
+ /**
+ * 班次（1=白班,2=夜班）
+ */
+ @Excel(name = "班次")
+ private Long classes;
+
/**
* 更新人
*/
@@ -84,6 +90,56 @@ public class BaseTeamMembers extends BaseEntity {
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
+ /**
+ * 开始时间
+ */
+ @Excel(name = "开始时间")
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ @Excel(name = "结束时间")
+ private String endTime;
+
+ /**
+ * 休息时间
+ */
+ @Excel(name = "休息时间")
+ private String dineTime;
+
+ public Long getClasses() {
+ return classes;
+ }
+
+ public void setClasses(Long classes) {
+ this.classes = classes;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getDineTime() {
+ return dineTime;
+ }
+
+ public void setDineTime(String dineTime) {
+ this.dineTime = dineTime;
+ }
+
public String getProductLineName() {
return productLineName;
}
diff --git a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
index ee79716..7dc1df3 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
@@ -22,6 +22,7 @@
+
@@ -33,6 +34,7 @@
ml.material_type,
ml.material_unit,
ml.material_matkl,
+ ml.DISPO,
ml.material_specifications,
ml.plant_code,
bf.factory_name plantName,
@@ -98,6 +100,7 @@
created_time,
updated_by,
updated_time,
+ DISPO,
#{objId},
@@ -117,6 +120,7 @@
#{createdTime},
#{updatedBy},
#{updatedTime},
+ #{DISPO},
@@ -139,6 +143,7 @@
created_time = #{createdTime},
updated_by = #{updatedBy},
updated_time = #{updatedTime},
+ DISPO = #{DISPO},
where obj_id = #{objId}
diff --git a/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
index 611b4bf..81b7653 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
@@ -16,6 +16,10 @@
+
+
+
+
@@ -29,7 +33,11 @@
tm.created_by,
tm.created_time,
tm.updated_by,
- tm.updated_time
+ tm.updated_time,
+ tm.start_time,
+ tm.end_time,
+ tm.dine_time,
+ tm.classes
from base_teammembers tm
left join base_productline bpl on bpl.PRODUCT_LINE_CODE = tm.PRODUCT_LINE_CODE
@@ -38,6 +46,7 @@
and tm.team_code = #{teamCode}
+ and tm.classes = #{classes}
and tm.team_name like concat(concat('%', #{teamName}), '%')
and tm.team_head = #{teamHead}
and tm.product_line_code = #{productLineCode}
@@ -47,6 +56,7 @@
and tm.updated_by = #{updatedBy}
and tm.updated_time = #{updatedTime}
+ ORDER BY tm.team_code