From 4dae2eea7d7bba7b6455a3f2d9c1588da14f74f3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 09:56:15 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90MES=20=E5=AF=BC=E5=85=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.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/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index c594693..5f5e21f 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 @@ -18,7 +18,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_MODULE { WORK_ORDER_LANDED(10, "生产工单下达"), - QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"); + QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"), + MES_WORK_ORDER(30, "生产工单导入"); private int value; private String description; From 5fc4c6c025e32879b8bb353abfa84bd4af6ea140 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Apr 2020 10:31:21 +0800 Subject: [PATCH 2/8] mes --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 9b37512..0db0a4c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2651,8 +2651,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"); -// DB(20, "DB"); + PLC(10, "PLC"), + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 2752dac..4dfc1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -38,13 +38,9 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable { @ApiParam("数据对象编号") private String dataObjectNo; -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; + @Column(name = "STORE_OBJECT_CODE") + @ApiParam("存储对象代码") + private String storeObjectCode; @Transient @ApiParam("任务名称") From c0e3f1cb4fcf2e94f51ae0acba49962faa0e12bf Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 11:08:28 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=90=E6=89=BE=E5=9B=9E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 2dad813..64f03c6 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 @@ -5502,6 +5502,10 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + int value; + String code; + String description; + WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; this.code = code; @@ -5725,6 +5729,14 @@ public class WmsEnumUtil { } public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 9b3dd796550e0df399f541c9054563637f6c4454 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 11:10:43 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 68 +++++++++++++++++------------------------------------------------ 1 file changed, 18 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index d6a60cc..7a083c9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -202,24 +202,24 @@ - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -254,36 +254,4 @@ ${project.artifactId}-${project.version} - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - \ No newline at end of file From a432b77ca0b1c2d53dee65517f6a82e10bbaf3ac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Apr 2020 12:41:53 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A11536=E3=80=901536=20PDA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 + .../i3plus/pojo/wms/bean/WmsTransportRule.java | 91 ++++++++++++++++++++++ .../wms/repository/WmsTransportRuleRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++ 4 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index b807a04..ead19c3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -107,6 +107,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java new file mode 100644 index 0000000..5c91192 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.*; +import java.util.List; + + +/** + * @Description : 运输规则表 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-03-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TRANSPORT_RULE") +@Api("运输规则表") +public class WmsTransportRule extends BaseBean { + private static final long serialVersionUID = 6120257805546343124L; + + @Column(name = "COMMAND_TYPE") + @ApiParam(value = "指令类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description") + private String commandType; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + public Integer busiType; + + @Column(name = "BUSI_SCENE_TYPE") + @ApiParam("业务场景") + //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + public Integer busiSceneType; + + + @Column(name = "SRC_AREA_NO") + @ApiParam("发货库存地") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String srcAreaNo; + + + @Column(name = "DEST_AREA_NO") + @ApiParam("目标库存地") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String destAreaNo; + + @Column(name = "OUT_VENDOR_NO") + @ApiParam("委外供应商编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String outVendorNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String partNo; + + @Column(name = "CUST_NO") + @ApiParam("客户代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String custNo; + + @Column(name = "IS_TRANSPORT") + @ApiParam("是否安排运输") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + public int isTransport; + + @Column(name = "REMARK",length = 255) + @ApiParam("备注") + public String remark; + + @ApiParam("物料编码") + @Transient + public List partNoLst; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java new file mode 100644 index 0000000..4a9acce --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 运输规则dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-03-27 10:30 + * @Modify: + **/ +@Repository +public interface WmsTransportRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c92cbc1..6f59761 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2907,4 +2907,17 @@ public class WmsHqlPack { return result; } + /** + * 运输规则分页查询条件 + * @param wmsTransportRule + * @return + */ + public static DdlPackBean packHqlBasPlugin(WmsTransportRule wmsTransportRule) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(wmsTransportRule.getBusiType(), "busiType", result); + DdlPreparedPack.getStringLikerPack(wmsTransportRule.getCustNo(), "custNo", result); + DdlPreparedPack.getStringLikerPack(wmsTransportRule.getPartNo(), "partNo", result); + getStringBuilderPack(wmsTransportRule, result); + return result; + } } From d2fb33d88849286575ecedd708d97d98a0572cac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Apr 2020 12:50:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?bug1536=E3=80=901536=20PDA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 79 ++++++++++++++++++---- 1 file changed, 66 insertions(+), 13 deletions(-) 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 64f03c6..dcc9407 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 @@ -5502,9 +5502,9 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); - int value; - String code; - String description; + private int value; + private String code; + private String description; WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; @@ -5689,6 +5689,16 @@ public class WmsEnumUtil { } return tmp; } + + 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; + } } /** @@ -5728,16 +5738,7 @@ public class WmsEnumUtil { return null; } - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - public static String valueOfDescription(int val) { + public static String valueOfDescription ( int val){ String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5787,4 +5788,56 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 业务场景Supplier + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BUSI_SCENE_TYPE { + YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"), + TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"), + ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"), + SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"), + CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提"); + private int value; + private String code; + private String description; + + BUSI_SCENE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static BUSI_SCENE_TYPE codeOf(String code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + return values()[i]; + } + } + return null; + } + 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; + } + } } \ No newline at end of file From 8a836e340aef6f206962dec77177c372913bac29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 13:26:23 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) 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 fc12b72..530863f 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 @@ -5378,6 +5378,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; @@ -5400,6 +5406,18 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public int getValue() { + return value; + } } /** @@ -5408,24 +5426,24 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", + "custNo,custName", "custNo,custName", "custNo", 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", + "code,name", "code,name", "code", 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", + "partNo,partName", "partNo", "partNo", 20, ""), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", - "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo,partGroupName", "partGroupNo", "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", "", "", 20, ""), @@ -5449,6 +5467,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; @@ -5492,6 +5516,18 @@ public class WmsEnumUtil { public String getFieldValue() { return fieldValue; } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } } /** From 836a4f710dd4af9bc5a53d242311ffe120fcf871 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 3 Apr 2020 00:02:10 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesEquipmentToolingModel.java | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java new file mode 100644 index 0000000..b15294e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesTooling; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : MES_设备工装关系Model + * @Reference : + * @Author :qianhuasheng + * @CreateDate : 2020-04-02 16:34 + * @Modify: + **/ +@Data +@Api("MES_设备工装关系Model") +public class MesEquipmentToolingModel implements Serializable { + + private static final long serialVersionUID = 1947971352179107711L; + + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("工装编号") + private String toolingNo; + + @ApiParam("工装代码") + private String toolingCode ; + + @ApiParam("工装名称") + private String toolingName; + + @ApiParam("工装类型") + private Integer toolingType; + + @ApiParam("使用次数") + private Integer useCount; + + @ApiParam("更换开始时间") + private String startTime; + + @ApiParam("更换结束时间") + private String endTime; + + @Transient + @ApiParam("最大次数") + private Integer useCountMax; + + public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) { + this.toolingCode = tooling.getToolingCode(); + this.toolingName = tooling.getToolingName(); + this.useCount = useCount; + this.useCountMax = tooling.getUseCountMax(); + } + public MesEquipmentToolingModel() { + } +}