From cac0421b997e879a8dbafa200487c02d8818b1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Mon, 9 Aug 2021 17:14:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1629=2019048-=E7=BB=84=E8=A3=85=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=A2=9E=E5=8A=A0=E8=A7=A3?= =?UTF-8?q?=E7=BB=91=E5=8A=9F=E8=83=BD-20210625?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java index e41b5ce..fbd3fb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description: * @Reference: @@ -48,6 +51,9 @@ public class MesProdBindRecordModel { private String serialNumber; @ApiParam("关联批次") private String lotNo; + @ApiParam("数据集合") + private List mesProdBindRecords; + public MesProdBindRecordModel() { } @@ -122,4 +128,5 @@ public class MesProdBindRecordModel { this.serialNumber = serialNumber; this.lotNo = lotNo; } + } From 388fc9089c092ad764e8d8e1e9e64c7b52a01d8c Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Aug 2021 18:08:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?16895=2019081-PC-MES-=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8A=80=E8=83=BD-=E7=A6=81=E7=94=A8=E5=90=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B7=B2=E7=BB=8F=E6=98=BE=E7=A4=BA-20210730?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 147360b..a0bfb4c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2835,7 +2835,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesUserSkill, organizeCode); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean); } @@ -3772,6 +3772,7 @@ public class MesHqlPack { /** * 数据迁移表查询条件封装 + * * @param cfg * @return */ From 6e94cb6c47b1eb1dc9cc8b61403ffa9322cc75d9 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Aug 2021 18:29:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=89=E6=95=88=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index a0bfb4c..0a0fe1f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2835,7 +2835,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode, CommonEnumUtil.VALID); if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean); } From 94274b0af9e2ee5d2c7e2c6baa905e360a676323 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 12 Aug 2021 16:46:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E9=A2=86=E6=96=99=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 8e8e88e..a381d13 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -428,7 +428,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("报废类型名字") public String scrapTypeName; - + @Transient + @ApiParam(value = "主表id") + private Long masterId; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; From 9ea42cd032b6890d68d5b43c1dc5af56888800e5 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 16 Aug 2021 14:29:11 +0800 Subject: [PATCH 5/7] =?UTF-8?q?16818=2020135-=E7=83=AD=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=B2=A1=E6=9C=89=E5=AE=9A=E6=88=90=E5=8A=9F?= =?UTF-8?q?CMS=E6=A0=87=E7=AD=BE=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index ddec01b..3482ee6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -4,17 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -30,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PACKAGE") +@Table(name = "IF_PACKAGE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "MODIFY_DATE_TIME")}) @Api("包装条码接口表") public class IfPackage extends BaseBean implements Serializable { From 98fb50c05974d4b237a5baf3d1f3b7b1e6d5e5de Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Tue, 17 Aug 2021 10:32:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 b55bde9..3a4ff36 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 @@ -1229,7 +1229,9 @@ public class WmsEnumUtil { PICKED(50, "配料"), OUT_STOCK(60, "出库"), SCRAP(70, "报废"), - COMMING(80, "在途"); + COMMING(80, "在途"), + INSPECTION(90,"待检验"), + HAS_INSPECTION(100,"已检验"); private int value; private String description; @@ -1396,8 +1398,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), - ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); - + ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"), + REWORK(50,"REWORK","返工"); private int value; private String code; private String description; From 3761eebb084ae6f6102be00440e504c461dbbc8b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 17 Aug 2021 16:49:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E5=8D=8E=E5=9F=9F-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9B=98=E7=82=B9=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 58c5249..e3d1182 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -1,7 +1,9 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,6 +124,11 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "package_no") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + @Transient @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") 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 cbcbc49..b40cda9 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 @@ -309,6 +309,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double weight ; + @Column(name = "STANDARD_BRACKET", columnDefinition = "decimal(18,8)") + @ApiParam(value = "标托", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double standardBracket; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue();