From 31e3d54b85d9da6472beb7e27b48264b871c9484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 2 Sep 2019 22:31:22 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BB=84=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC0=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 2bdc67f..1ea54c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -74,14 +74,6 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; - public void setInitAmId(Long initAmId) { - this.initAmId = initAmId == null ? 0 : this.initAmId.longValue(); - } - - public void setDetailsAmId(Long detailsAmId) { - this.detailsAmId = detailsAmId == null ? 0 : this.detailsAmId.longValue(); - } - public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue(); } From 2e8a70d8b46b5d1664bfcc8b7444cf095feb8005 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Sep 2019 11:20:35 +0800 Subject: [PATCH 02/15] =?UTF-8?q?pom=E7=89=88=E6=9C=AC=E8=BF=98=E5=8E=9F--?= =?UTF-8?q?pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..86d7736 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..0798953 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f355cca..f220aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From c9143fed9e6b9c66bac9de98cb799159aa5d6418 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 17 Sep 2019 19:42:56 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 0e53b60..fcf34e6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -245,6 +245,16 @@ public class AndonEnumUtil { return tmp; } + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].code, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + public static int descriptionOfValue(String val) { int tmp = -1; for (int i = 0; i < values().length; i++) { From e52c310d38b126161416412d4ec3cf15117a0158 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Wed, 18 Sep 2019 13:35:35 +0800 Subject: [PATCH 04/15] =?UTF-8?q?add=20=E5=85=A5=E5=BA=93pojo=20=E5=92=8Cr?= =?UTF-8?q?esponse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 45 ++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 62 ++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 85 ++++++++++++++++++++++ .../wms/repository/WmsPartRoutingRepository.java | 18 +++++ .../pojo/wms/repository/WmsRoutingRepository.java | 17 +++++ .../wms/repository/WmsRoutingRoleRepository.java | 17 +++++ 6 files changed, 244 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java new file mode 100644 index 0000000..0be04b6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :存储区 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 11:50 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PART_ROUTING") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="物料线路关系表",description = "物料线路关系表") +public class WmsPartRouting extends BaseBean { + + private static final long serialVersionUID = 7759454799191378612L; + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路编号") + private String areaNo; + + + public WmsPartRouting(){} + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java new file mode 100644 index 0000000..0b9f58c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :存储区 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 11:50 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ROUTING") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="物流线路信息表",description = "物流线路信息表") +public class WmsRouting extends BaseBean { + + private static final long serialVersionUID = 7759454799191378612L; + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "线路名称") + private String routingName; + + @Column(name = "ROUTING_DESC") + @ApiParam(value = "线路描述") + private String routingDesc; + + @Column(name = "FOR_PROUCT_CLASS") + @ApiParam(value = "适用产品分类") + private Integer forProductClass; + + @Column(name = "FOR_WAREHOUSE") + @ApiParam(value = "适用仓库", example ="1") + private Integer forWareHouse; + + @Column(name = "FOR_PRODUCT") + @ApiParam(value = "适用产品") + private Integer forProduct; + + + + public WmsRouting(){} + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java new file mode 100644 index 0000000..d013c16 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -0,0 +1,85 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :存储区 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 11:50 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ROUTING_RULE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="物流线路规则表",description = "物流线路规则表") +public class WmsRoutingRule extends BaseBean { + + private static final long serialVersionUID = 7759454799191378612L; + @Column(name = "RULE_CODE") + @ApiParam(value = "规则编号") + private String ruleCode; + + @Column(name = "RULE_NAME") + @ApiParam(value = "规则名称") + private String ruleName; + + @Column(name = "RULE_DESC") + @ApiParam(value = "规则描述") + private String ruleDesc; + + @Column(name = "SEQ") + @ApiParam(value = "排序号") + private Integer seq; + + @Column(name = "RULE_TYPE") + @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10") + private Integer ruleType; + + @Column(name = "ZONE_NO_SRC") + @ApiParam(value = "源存储区") + private String zoneNoSrc; + + @Column(name = "ZONE_NO_TARGET") + @ApiParam(value = "目标存储区" , example = "2") + private String zoneNoTarget; + + @Column(name = "OP_TYPE_CODE") + @ApiParam(value = "作业类型" , example = "2") + private String opTypeCode; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型" , example = "1") + private String transTypeCode; + + @Column(name = "MODE_CODE") + @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1") + private Integer modeCode; + + @Column(name = "DELAY_TIME") + @ApiParam(value = "延迟时间" , example = "1") + private Integer dalayTime; + + @Column(name = "DELAY_UNIT") + @ApiParam(value = "延迟时间单位(M:分钟，D:天)") + private String delayUnit; + + + public WmsRoutingRule(){} + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java new file mode 100644 index 0000000..2ecd401 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartRouting; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(存储区信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsPartRoutingRepository extends BaseRepository { + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java new file mode 100644 index 0000000..86212fd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsRouting; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(存储区信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsRoutingRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java new file mode 100644 index 0000000..f081961 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingRule; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(存储区信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsRoutingRoleRepository extends BaseRepository { + +} From b31162c5d6fa8729b3e1ffc2e6e97adf18ea0be4 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 18 Sep 2019 13:37:00 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=94=BE=E8=A1=8C=EF=BC=8C=20=E5=AE=89=E7=81=AF=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 0e53b60..17335f3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -211,9 +211,10 @@ public class AndonEnumUtil { SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), CANCEL(4,"40", "撤销"), - COMMIT(5,"50","提交"), - PASS(6,"60","审批"), - REJECT(7,"70","驳回"); + COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审” + PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成” + REJECT(7,"70","驳回"), + CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举 private int value; private String code; @@ -245,6 +246,16 @@ public class AndonEnumUtil { return tmp; } + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].code, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + public static int descriptionOfValue(String val) { int tmp = -1; for (int i = 0; i < values().length; i++) { From 83f400a36b3d7b0d7eb7034135807ed608f4f841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 18 Sep 2019 14:07:53 +0800 Subject: [PATCH 06/15] =?UTF-8?q?sql=20=E6=B3=A8=E5=85=A5=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=96=9C=E6=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 0e8af5f..4823179 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -25,7 +25,7 @@ public class HqlPack { return data.toString().replaceAll(";","") .replaceAll("'","") .replaceAll("\"","") - .replaceAll("/","") +// .replaceAll("/","") .replaceAll("\\\\","") .replaceAll("delete","") .replaceAll("update","") From c7ed8613d658da3f84f6d2a30df005f8b087de0e Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 18 Sep 2019 14:52:38 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0WebService=20=E9=BB=98=E8=AE=A4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 922653c..3d850d5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil { SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), + CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), /* 数据源 */ CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), From c6badc59c60a3c9123317b64fe858b9da6a0d35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 18 Sep 2019 15:01:36 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0id=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index c865be3..d999d66 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -319,6 +319,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){ DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); From d8bc8d713dd2abd6e23bfbe3ad081bbd2e221646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 18 Sep 2019 17:03:05 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0model?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +- .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 32 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 3 ++ .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 ++ 4 files changed, 40 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 4b8c2ce..a4572cc 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 @@ -1879,7 +1879,8 @@ public class WmsEnumUtil { ZONE(20, "ZONE", "存储区对象"), LOCATE(30, "LOCATE", "库位对象"), MATERIAL(40, "MATERIAL", "物料对象"), - TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"); + TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), + BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"); private String code; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index ce22558..c9a988d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster; import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster; import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -37,6 +40,35 @@ public class PrintOrderDataModel implements Serializable { @ApiParam(value = "移库单主表") public WmsDocMovementMaster movementMaster; + @ApiParam(value = "状态") + @Transient + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + + @ApiParam(value = "供应商名称") + @Transient + public String vendorName; + + @ApiParam(value = "供应商编码") + @Transient + public String vendorNo; + + @ApiParam(value = "客户编码") + @Transient + public String custNo; + + @ApiParam(value = "ERP编号") + @Transient + public String erpSrcNo; + + @ApiParam(value = "联系人") + @Transient + public String vendorOwner; + + @ApiParam(value = "供应商邮箱") + @Transient + public String vendorEmail; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index a545be8..8b24b26 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -49,6 +51,7 @@ public class WmsPOMaster extends BaseBean { */ @Column(name = "PO_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer poStatus; @Column(name = "VENDOR_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 20c7692..2079deb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -42,6 +42,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("交易代码列表") private List transTypeList; + @ApiParam("业务类型列表") + private List busiTypeList; + @ApiParam( value = "新增操作", example = "0" From baf39dc0ce32805f1854b5e18c1f3da7dec7e867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 18 Sep 2019 17:09:18 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsProductReturnMovement.java | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java new file mode 100644 index 0000000..9122049 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** +* @Description : 生产退料导入模板 +* @Reference : +* @author: amy.liu +* @date: 2019/9/17 17:10 +* @Modify: +*/ + +@Data +@Api(value="生产退料导入模板",description = "生产退料导入模板") +public class WmsProductReturnMovement implements Serializable{ + + @ApiParam(value = "单号") + @AnnoOutputColumn + private String orderNo; + + @ApiParam(value = "物料编码") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam(value = "源存储区") + @AnnoOutputColumn + private String srcZoneNo; + + @ApiParam(value = "目标存储区") + @AnnoOutputColumn + private String destZoneNo; + + @ApiParam(value = "业务类型") + @AnnoOutputColumn + private String busiType; + + @ApiParam(value = "工厂") + @AnnoOutputColumn + private String factory; + + @ApiParam(value = "计划日期") + @AnnoOutputColumn + private String planDate; + + @ApiParam(value = "计划时间") + @AnnoOutputColumn + private String planTime; + + +} From 5d1e6e847437b99f37aa919f9c2a2e2820e53beb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 18 Sep 2019 17:24:05 +0800 Subject: [PATCH 11/15] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=20=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=8E=A8=E8=8D=90=E5=85=A5=E5=BA=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 ++++ .../i3plus/pojo/wms/engine/rule/GenerateLocateRule.java | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 372cdaa..fad9c66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -106,6 +106,10 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "入库箱数", example = "-1") private Integer destBoxQty; + @Transient + @ApiParam(value = "错误信息", example = "-1") + private String errorMsg; + @Column(name = "ENCRYPTION_NO") @ApiParam(value = "加密编码") private String encryptionNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index 6b478cf..480fb35 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -22,31 +22,30 @@ public class GenerateLocateRule { /** * 存储区 */ - List zonesList; + private List zonesList; /** * 库位类型 */ - Integer locateType; + private Integer locateType; /** * 工厂代码 */ - String organizeCode; + private String organizeCode; /** * 库位代码 */ - String locateNo; + private String locateNo; /** * 入库箱数 */ - Integer destQty; + private Integer destQty; /** * 物料名称 */ - String partNo; - + private String partNo; } From 1e01f621887eb071022be4b628c25c7f1e9bde39 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 18 Sep 2019 19:05:57 +0800 Subject: [PATCH 12/15] =?UTF-8?q?Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 0c99c73..4beffc1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -159,7 +159,7 @@ public class CoreHqlPack { // String Like DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); // Number In DdlPreparedPack.getInPackList(idList,"id",result); return result; From 9ed873422ef869d02bd5a630076f614a73dabcad Mon Sep 17 00:00:00 2001 From: wangjie Date: Wed, 18 Sep 2019 21:33:40 +0800 Subject: [PATCH 13/15] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 20 +++--------- .../estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 37 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 +++ ...xcelErrorModel.java => MesExcelErrorModel.java} | 4 +-- ...elResultModel.java => MesExcelResultModel.java} | 17 ++++++---- .../mes/repository/MesShiftGroupRepository.java | 16 ++++++++++ 6 files changed, 74 insertions(+), 24 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesPlanOrderExcelErrorModel.java => MesExcelErrorModel.java} (83%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesPlanOrderExcelResultModel.java => MesExcelResultModel.java} (61%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 51a686b..53478dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -100,6 +100,11 @@ public class MesPlanOrder extends BaseBean { private String workCenterCode; /********************** 冗余字段 *********************************/ + + @Transient + @ApiParam(value="区域") + public String areaCode; + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @@ -122,21 +127,6 @@ public class MesPlanOrder extends BaseBean { @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String endTimeEnd; - @Transient - public List planTypeEnum; - - @Transient - public List planOrderStatusEnum; - - @Transient - public List getPlanTypeEnum() { - return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values()); - } - - public List getPlanOrderStatusEnum() { - return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values()); - } - public double getPlanQtyVal() { return this.planQty == null ? 0.0d : this.planQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java new file mode 100644 index 0000000..f31bdf6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_SHIFT_GROUP") +@Api("班组") +public class MesShiftGroup extends BaseBean { + @Column(name="GROUP_CODE") + @ApiParam("班组代码") + private String groupCode; + + @Column(name="GROUP_NAME") + @ApiParam("班组名称") + private String groupName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0b77fc4..ba6525c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -125,6 +125,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("备注") private String memo; + @Column(name="SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value="工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java index 00ac219..a65e891 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java @@ -17,8 +17,8 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -@Api("mes生产计划导入异常结果model") -public class MesPlanOrderExcelErrorModel implements Serializable { +@Api("mes导入异常结果model") +public class MesExcelErrorModel implements Serializable { @ApiParam("错误的行号") private int rowNum; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java similarity index 61% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java index e7d3068..491dfc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java @@ -18,22 +18,25 @@ import java.util.List; @Data @NoArgsConstructor @AllArgsConstructor -@Api("mes生产计划导入结果model") -public class MesPlanOrderExcelResultModel implements Serializable { +@Api("mes导入结果model") +public class MesExcelResultModel implements Serializable { @ApiParam("结果") private boolean result; - @ApiParam("成功数量") - private int successNum; + @ApiParam("成功行数量") + private int successRowNum; - @ApiParam("失败数量") - private int errorNum; + @ApiParam("失败行数量") + private int failRowNum; @ApiParam("错误信息集合") - private List mesPlanOrderExcelErrorModel; + private List mesExcelErrorModel; @ApiParam("错误的行号") private String errorRows; + @ApiParam("导入数据集合") + private List excelList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java new file mode 100644 index 0000000..6949ba8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesShiftGroupRepository extends BaseRepository { +} From 24a31c0bdf4da933b9ca8aa24a3675268412bedb Mon Sep 17 00:00:00 2001 From: wangjie Date: Thu, 19 Sep 2019 09:47:23 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 12 +++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 34 +++++--------------- 4 files changed, 94 insertions(+), 26 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 08da054..eca112e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesWorkOrder实体对应的approvalStatus值 审批状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_APPROVAL_STATUS { + + WAIT_APPROVAL(10, "待审批"), + COMPLETE_APPROVAL(20, "已审批"), + REJECT_APPROVAL(30, "驳回"); + + private int value; + private String description; + + WORK_ORDER_APPROVAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes-pcn定时任务状态 * */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java new file mode 100644 index 0000000..bf6bb5e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_SHIFT_GROUP") +@Api("班组") +public class MesShiftGroup extends BaseBean { + @Column(name="GROUP_CODE") + @ApiParam("班组代码") + private String groupCode; + + @Column(name="GROUP_NAME") + @ApiParam("班组名称") + private String groupName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 6a15c4d..e28e0e0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -111,6 +111,14 @@ public class MesWorkOrder extends BaseBean { @ApiParam("备注") private String memo; + @Column(name="SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name="APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -138,4 +146,8 @@ public class MesWorkOrder extends BaseBean { public int getWorkOrderTypeVal() { return this.workOrderType == null ? 0 : this.workOrderType; } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index ba6525c..81037ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -129,6 +128,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("班组") private String shiftGroup; + @Column(name="APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value="工作中心名称") @@ -171,31 +174,6 @@ public class MesWorkOrder extends BaseBean { @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") public String endTimeEnd; - - @Transient - @ApiParam("工单类型枚举") - private List workOrderTypeDropData; - - public List getWorkOrderTypeDropData() { - return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values()); - } - - @Transient - @ApiParam("工单状态枚举") - private List workOrderStatusDropData; - - public List getWorkOrderStatusDropData() { - return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values()); - } - - @Transient - @ApiParam("工单来源枚举") - private List workOrderSourceDropData; - - public List getWorkOrderSourceDropData() { - return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values()); - } - @Transient @ApiParam("mes生产工单页面按钮控制") private MesWorkOrderButtonModel workOrderButtonModel; @@ -228,4 +206,8 @@ public class MesWorkOrder extends BaseBean { public int getWorkOrderTypeVal() { return this.workOrderType == null ? 0 : this.workOrderType; } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } } From 81128be4e77666b075d53c4b849e92b8fc349911 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 19 Sep 2019 13:46:56 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E9=A2=91=E6=AC=A1=EF=BC=8C=20=E5=91=A8?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E9=A2=91=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index db58777..27925ec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -325,6 +325,14 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "安灯状态集合") private List statusCodeList; + @Transient + @ApiParam(value = "日发生次数") + private int dayTime; + + @Transient + @ApiParam(value = "周发生次数") + private int weekendsTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall;