From e1dd7c3cdd8c5572947647274dd6c6c53fb5a00a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 14 Jan 2020 10:22:22 +0800 Subject: [PATCH 1/9] =?UTF-8?q?PTL=20=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-ptl-pcn/pom.xml | 26 ++++++++ .../estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java | 71 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/pcn/package-info.java | 14 +++++ .../ptl/pcn/repository/PpTestUserRepository.java | 14 +++++ modules/i3plus-pojo-ptl/pom.xml | 22 +++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java | 73 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/package-info.java | 14 +++++ .../pojo/ptl/repository/PtlTestUserRepository.java | 14 +++++ 8 files changed, 248 insertions(+) create mode 100644 modules/i3plus-pojo-ptl-pcn/pom.xml create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java create mode 100644 modules/i3plus-pojo-ptl/pom.xml create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java diff --git a/modules/i3plus-pojo-ptl-pcn/pom.xml b/modules/i3plus-pojo-ptl-pcn/pom.xml new file mode 100644 index 0000000..ed7ad85 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/pom.xml @@ -0,0 +1,26 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl-pcn + jar + + + + i3plus.pojo + i3plus-pojo-base + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java new file mode 100644 index 0000000..bd13740 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_PCN_TEST_USER") +@Api(value="PTL PCN 测试用户",description = "测试用户") +public class PpTestUser extends BaseBean { + + private static final long serialVersionUID = -8985367251249816850L; + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java new file mode 100644 index 0000000..1e562ec --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl.pcn; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.pcn.bean + * 创建Bean Pp 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java new file mode 100644 index 0000000..ddcca36 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.pcn.bean.PpTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PpTestUserRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml new file mode 100644 index 0000000..92de049 --- /dev/null +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -0,0 +1,22 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl + jar + + + + i3plus.pojo + i3plus-pojo-base + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java new file mode 100644 index 0000000..5f056b7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_TEST_USER") +@Api(value="PTL 测试用户",description = "测试用户") +public class PtlTestUser extends BaseBean { + + private static final long serialVersionUID = -130240511327784335L; + + + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java new file mode 100644 index 0000000..70b4956 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.bean + * 创建Bean 以Ptl 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java new file mode 100644 index 0000000..91896ed --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PtlTestUserRepository extends BaseRepository { +} From 3e31641b20d777c6fbe2ee9fcbc4a37b999e8238 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 14 Jan 2020 10:24:13 +0800 Subject: [PATCH 2/9] =?UTF-8?q?PTL=20=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=20PTL=20PCN=20=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 ++++- pom.xml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 873e21d..33d75d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -27,6 +27,9 @@ public class CommonEnumUtil { MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), SWEB(7, 8800, 19, "i3sweb", "供应商服务"), + PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + FORM(20, 8900, 16, "block-form", "智能表单"), REPORT(21, 8910, 17, "block-report", "智能报表"), WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), @@ -35,7 +38,7 @@ public class CommonEnumUtil { HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8410, 15, "APS", "高级计划与排程"), + APS(28, 8400, 15, "APS", "高级计划与排程"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), diff --git a/pom.xml b/pom.xml index d2b502e..a7b24f3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,8 @@ modules/i3plus-pojo-sweb modules/i3plus-pojo-andon modules/i3plus-pojo-lac + modules/i3plus-pojo-ptl + modules/i3plus-pojo-ptl-pcn From 3a9e719005442c4d53c699941a0a742c40978e1c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 14 Jan 2020 10:45:56 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90vda=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E5=88=86=E7=BB=84=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=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/wms/bean/WmsMoveDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 3311b77..a9b133d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -125,6 +125,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + public String groupNo; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From 35839db806dcc7e5561677e88a532ff9cacd1290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 13:26:23 +0800 Subject: [PATCH 4/9] =?UTF-8?q?BUG#7359=20=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E5=92=8C=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 11 +++++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 10 +++------- 3 files changed, 20 insertions(+), 11 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 e618c9d..db1551c 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 @@ -736,6 +736,16 @@ public class WmsEnumUtil { return tmp; } + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index fac11e3..e55cf6c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("关联单号") public String refSrc; - @ApiParam(value = "关联单据业务类型") - private String busiTypeDesc; + @ApiParam(value = "关联单据业务类型代码") + private String busiTypeCode; @ApiParam(value = "计划日期") private String zdate; @@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "创建人") public String createUser; + @ApiParam(value = "关联单据类型") + public String refType; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo, + String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; this.transTypeCode = transTypeCode; this.refSrc = refSrc; - this.busiTypeDesc = busiTypeDesc; + this.busiTypeCode = busiTypeCode; this.zdate = zdate; this.ztime = ztime; this.custNo = custNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ea889c4..ef16765 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - public Integer busiType; - - @Column(name = "BUSI_TYPE_DESC") - @ApiParam("业务类型描述") - public String busiTypeDesc; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam("业务类型代码") + public String busiTypeCode; @Column(name = "TRANS_TYPE_CODE_RDD") @ApiParam("交易类型") From fd1a0ebdb816fe05b43b4f27e02e29f3255a8d5b Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 14 Jan 2020 14:18:05 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1404=20?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F=20=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 61 ++-------------------- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 13 +++++ 2 files changed, 16 insertions(+), 58 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java index b038988..f2ec4a3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -18,63 +18,8 @@ public class QcCheckStandardModel { private Long id; - @ApiParam("物料编码") - private String partNo; + @ApiParam("列头") + private String title; - @ApiParam("工作中心代码") - private String workCenterCode; - - @ApiParam("工作单元代码") - private String workCellCode; - - @ApiParam("检测类型") - private Integer checkType; - - @ApiParam("检测项") - private String checkItem; - - @ApiParam("检测标准") - private String checkStandard; - - @ApiParam("检测指导") - private String checkGuide; - - @ApiParam("频率") - private String checkFrequency; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("检测结果") - private String checkResult; - - @ApiParam("检测值") - private String checkValue; - - @ApiParam("检测项类型") - private String checkItemType; - - @ApiParam("检测项类型名称") - private String checkItemTypeName; - - private List childQcList; - - public QcCheckStandardModel() { - } - - public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard - , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { - this.id = id; - this.partNo = partNo; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.checkType = checkType; - this.checkItem = checkItem; - this.checkStandard = checkStandard; - this.checkGuide = checkGuide; - this.checkFrequency = checkFrequency; - this.partName = partName; - this.checkItemType = checkItemType; - this.checkItemTypeName = checkItemTypeName; - } + private List resultList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 32ad09c..b11e807 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -98,6 +98,19 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "动作类型") private String actionType; + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + + @ApiParam(value = "动作类型名称") + private String actionTypeName; + + @ApiParam("产品条码零件名称") + private String partName; + + @ApiParam("原材料零件名称") + private String itemPartName; + + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; } From ad8e51dfaed814399af83969dddc1d2bfca6634e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 14 Jan 2020 17:36:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 0d4e335..8f9fb9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -224,6 +224,7 @@ public class WmsPart extends BaseBean { @Column(name="verb_num") @ApiParam(value = "单次拆包数") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") From 0e54d9a5b6b220535380dd67e9a71b1ea34e9dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 19:53:13 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1403=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8BisCommitRefMove=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BAcom?= =?UTF-8?q?mitMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 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 a220465..4da9c3f 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 @@ -4875,4 +4875,50 @@ public class WmsEnumUtil { } } + + /** + * 流程提交类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_COMMIT_MODE { + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), + REF_GROUP(30, 30, "关联分组号提交"); + + private int value; + private int code; + private String description; + + GROUP_COMMIT_MODE(int value, int code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } + + 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) { + return valueOf(val); + } + } + } \ No newline at end of file From cb7f868d648dd0927f3285332cbde709313488a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 20:14:24 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1403=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8BisCommitRefMove=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BAcom?= =?UTF-8?q?mitMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 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 41e57d1..5528099 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 @@ -2,6 +2,7 @@ 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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer autoInit; - // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) - @ApiParam(value = "是否连带提交创建状态移动单", example = "2") - @AnnoOutputColumn - private Integer isCommitRefMove; + @Column(name = "COMMIT_MODE", nullable = false) + @ApiParam(value = "提交移动单模式") + @AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class) + private Integer commitMode; // 1=true, 2 = false @Column(name = "IS_AUTO_COMMIT", nullable = false) - @ApiParam(value = "是否自动提交", example = "1") + @ApiParam(value = "是否自动提交") @AnnoOutputColumn private Integer isAutoCommit; @@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } - public int getIsCommitRefMoveVal() { - return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + public int getCommitModeVal() { + return this.commitMode == null ? 0 : this.commitMode.intValue(); } public int getIsAutoCommitVal() { From fff79a784690dc32d853f12256e356b7d98c2a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 15 Jan 2020 09:52:58 +0800 Subject: [PATCH 9/9] =?UTF-8?q?GROUP=5FCOMMIT=5FMODE=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BA=A4?= 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, 1 insertion(+), 2 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 4da9c3f..b3eb04f 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 @@ -4881,8 +4881,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_MODE { - JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), - REF_GROUP(30, 30, "关联分组号提交"); + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交"); private int value; private int code;