From f0147d2680cf94398b215f75e02ccb41f4dd5dbd Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 27 Jul 2021 10:32:21 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8C=89=E8=AE=A2=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=AE=8C=E6=88=90=E6=9C=80=E5=A4=A7=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E9=99=90=E5=88=B6=EF=BC=8C=E7=89=B5=E7=BA=B1=E6=8B=86?= =?UTF-8?q?=E4=BD=99=E6=95=B0=E5=88=B0=E6=89=8B=E5=B7=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index cdadeb0..a0b9d60 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -61,8 +61,4 @@ public class HeuristicRule extends BaseRule { @Column(name="WORK_GROUP_INTERVAL") @ApiParam(value ="工作分组间隔") private String workGroupInterval; - - @Column(name="REVER_FLUSH_PLAN") - @ApiParam(value ="逆向刷新计划") - private Boolean reverFlushPlan = false; } From d0b880c7aae288b83081675305570baf1d88cc28 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 28 Jul 2021 09:22:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=89=B5=E7=BA=B1=E6=8B=86=E4=BD=99?= =?UTF-8?q?=E6=95=B0=E5=88=B0=E6=89=8B=E5=B7=A5=E8=AE=BE=E5=A4=87=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E7=A1=AB=E5=8C=96=E8=A1=A5=E6=BB=A1=E6=A8=A1=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 47 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 +- .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java | 4 ++ .../aps/repository/ResGanttTableRepository.java | 9 +++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java new file mode 100644 index 0000000..c4c3652 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :资源甘特图资源表格 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-07-27 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_RES_GANTT_TABLE") +@Api("资源甘特图资源表格") +public class ResGanttTable extends BaseAPS { + private static final long serialVersionUID = -8818717728985340196L; + + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + + @Column(name="DISPLAY") + @ApiParam(value ="是否在界面显示") + @FieldAnnotation(defaultValue = "true") + private Boolean display = true; + + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + private Integer orderNumber; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 259a563..4dc3873 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -182,7 +182,7 @@ public class Work extends BaseAPS { // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; - private transient boolean hasOptimized = false; + private transient boolean supplyCount = false; // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java index b5007f0..7a4c619 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java @@ -22,4 +22,8 @@ public class KPIModel { private String settingTimes; private Integer overdueSalesCount; + + private Integer avaliableResCount; + + private Integer stopResCount; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java new file mode 100644 index 0000000..d5d6928 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ResGanttTable; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ResGanttTableRepository extends CrudRepository { +} From 3a5fad2a743e775afec9a58353735661e9ce1ba1 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Jul 2021 10:32:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A1=AB=E5=8C=96?= =?UTF-8?q?=E8=A1=A5=E6=BB=A1=E6=A8=A1=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8B=E5=8F=91=E6=9C=AA=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 08cbb35..98fd04b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -61,4 +61,8 @@ public class SysParam extends BaseAPS { @Column(name="SPLIT_BY_SHIFT") @ApiParam(value ="按班次分割下发的工作") private Boolean splitByShift; + + @Column(name="RES_GANTT_LABEL") + @ApiParam(value ="资源甘特图工作块显示标签") + private String resGanttLabel; } From 9c9af1097393504771493dd75de8f67392eee845 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Jul 2021 16:53:10 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A1=AB=E5=8C=96?= =?UTF-8?q?=E8=A1=A5=E6=BB=A1=E6=A8=A1=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8B=E5=8F=91=E6=9C=AA=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java index c4c3652..dd14d5b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -44,4 +44,7 @@ public class ResGanttTable extends BaseAPS { @Column(name="ORDER_NUMBER") @ApiParam(value ="序号") private Integer orderNumber; + + @ApiParam(value ="枚举项内容") + private transient Enum[] enumItems; } From 4de836b28abf5a56d0040de4d6e13bfcc01c505d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Jul 2021 20:37:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0=E9=80=89=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index c84d7d8..ef4b08e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1882,7 +1882,8 @@ public class WmsEnumUtil { public enum QC_ITEM_STATUS { NORMAL(10, "正常"), CANCELLATION(20, "已处理"), - SPECIAL(30, "部分特采"); + SPECIAL(30, "部分特采"), + XUANBIE(40, "选别"); private int value; private String description; From 0bd75ba2fe56d4b5fe8f647fa59ca135664ce450 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 31 Jul 2021 15:38:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8B=E5=8F=91=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 1 + 3 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 83c965a..bef6a1c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -46,4 +46,8 @@ public class DayShift extends BaseAPS { @FieldAnnotation(notEmpty = true) @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class}) private String workTimes; + + @Column(name="COLOR") + @ApiParam(value ="颜色") + private String color; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java index dd14d5b..e40a718 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,6 +46,10 @@ public class ResGanttTable extends BaseAPS { @ApiParam(value ="序号") private Integer orderNumber; + private transient ApsEnumUtil.FIELD_TYPE type; + + private transient ApsEnumUtil.EDIT_TYPE editType; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 4254fba..6e2e3bb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -24,4 +24,5 @@ public class GanttPlanModel { private Long workId; private List resIds; private Boolean draggable; + private Boolean furnacePlan = false; } From d1a9fe37cd6eee5607be575dad51ea89e803a36c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 31 Jul 2021 19:40:59 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=B0=83=E5=B7=AEBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index d7dd874..1552eba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -241,4 +241,10 @@ public class WmsCSOrderDetails extends BaseBean { this.partNo=partNo; this.partNameRdd = partNameRdd; } + public WmsCSOrderDetails(String organizeCode,String partNo,String locateNo, Double qty) { + this.organizeCode=organizeCode; + this.partNo = partNo; + this.locateNo = locateNo; + this.qty = qty; + } } From c8074d219a6cd5432e3782d239d661911e3deb84 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 3 Aug 2021 19:17:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index bef6a1c..8d7733d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.validator.ImportGroup; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -49,5 +50,6 @@ public class DayShift extends BaseAPS { @Column(name="COLOR") @ApiParam(value ="颜色") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.COLOR_PICKER) private String color; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 96546b7..9f9e6b2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1037,7 +1037,8 @@ public class ApsEnumUtil { OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"), MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"), - QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"); + QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"), + COLOR_PICKER("COLOR_PICKER", "颜色选择框"); private String value; private String description;