From 7ecbed2cda81eb1e924bf84560ff406623296581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Nov 2020 15:02:06 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix(order):=E6=9C=AA=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 6bb092f..ed8ce43 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -63,9 +64,15 @@ public class SysOrderNoRule extends BaseBean { @Column(name = "IS_CYCLE") @ApiParam(value = "达到最大值后是否循环",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isCycle; + @Column(name = "IS_FIXED_LENGTH") + @ColumnDefault("2") + @ApiParam(value = "是否固定序号长度长度",example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isFixedLength; + @Column(name = "SERIAL_NO") @ApiParam(value = "当前流水号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) From c20922a4558510af2ea57d0659e2e084d305eba0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 2 Dec 2020 17:34:22 +0800 Subject: [PATCH 02/10] =?UTF-8?q?Fix=20bug#12879=20COGI=E8=B0=83=E8=B4=A6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=87=BA=E5=BA=93=E5=8D=95=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 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 14d440e..4699854 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 @@ -869,8 +869,9 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), - COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), - SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), + SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR private int value; private String code; From 02d002b9586a54c439cb4915c0c86d10a45937bc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 12:15:14 +0800 Subject: [PATCH 03/10] =?UTF-8?q?package=20detail=20=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E8=81=94=E5=90=88=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index beb90ed..0f28b91 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -26,10 +26,10 @@ import java.io.Serializable; @Index(columnList = "PACKAGE_NO"), @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PART_NO"), - @Index(columnList = "PACKAGE_NO2") -}/*, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -}*/) + @Index(columnList = "PACKAGE_NO2"), + @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"), + @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER") +}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; From 13868d5cd171046ab35837aa3b57a1ef3b42f267 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 12:36:54 +0800 Subject: [PATCH 04/10] =?UTF-8?q?producesn=20=E5=A2=9E=E5=8A=A0=E7=B4=A2?= =?UTF-8?q?=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index c0b3162..b71d6ac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -26,6 +26,7 @@ import java.math.BigDecimal; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), From 28da49aa29e4cf8d062d5cc70e9620d449d72d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 3 Dec 2020 15:59:15 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=9012422=2019048=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=96=B7=E6=B6=82=E6=8A=9B=E5=85=89=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=2020201112=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/mes/bean/MesDefectRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 34acd47..cb04f19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -132,12 +132,13 @@ public class MesDefectRecord extends BaseBean implements Serializable { } public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode, - String workCellCode, String modifyUser, String modifyDatetime) { + String workCellCode, String serialNumber, String modifyUser, String modifyDatetime) { this.partNo = partNo; this.workOrderNo = workOrderNo; this.partName = partName; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; + this.serialNumber = serialNumber; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } From d64a8fd31c26b8b9e3a7510a12cbc7d450fe3720 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:11:42 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 +++ 2 files changed, 39 insertions(+) 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 98ad82a..363e667 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 @@ -3126,6 +3126,41 @@ public class MesEnumUtil { } /** + * 工步参数 是否必填 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_PARAM_IS_NEED { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + MES_STEP_PARAM_IS_NEED(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工作单元参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index cd1bd7f..99c4596 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -65,6 +65,10 @@ public class MesStepParam extends BaseBean implements Serializable { @ApiParam("参数对象") private String objectCode; + @Column(name = "IS_NEED") + @ApiParam("是否必填") + private Integer isNeed = 1; + @Column(name = "TYPE") @ApiParam("type") private Integer type = 0; From 2b522ca15de14e354e0574c8cbb9e45871afcc74 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:14:21 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 99c4596..1a6f5b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -66,7 +66,7 @@ public class MesStepParam extends BaseBean implements Serializable { private String objectCode; @Column(name = "IS_NEED") - @ApiParam("是否必填") + @ApiParam("是否必需") private Integer isNeed = 1; @Column(name = "TYPE") From 14c47545e78fa571b0ccf216c005f0f27e8255e4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 3 Dec 2020 20:10:43 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java index 1c05c3c..6aaf4fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -11,7 +11,7 @@ import lombok.Data; @Data public class SparePartStockModel { - private Integer maxQty; + private String maxQty; - private Integer minQty; + private String minQty; } 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 bcde4c8..ee666a5 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 @@ -3327,9 +3327,9 @@ public class MesHqlPack { if (queueJitPlan.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); } - if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(), + "planDate", packBean, true); } if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), From 56989acba2646c9a8338b0262f3171b5c1dda626 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 3 Dec 2020 21:00:02 +0800 Subject: [PATCH 09/10] =?UTF-8?q?12362=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?-=E9=A6=96=E6=A3=80=E6=A3=80=E9=AA=8C=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=8A=B6=E6=80=81=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E5=B7=B2=E6=A3=80=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98-20201115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index ed50194..20ac65a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -145,4 +145,15 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("本批次生产总数") private Double locSrcLotNoQty; + @Transient + @ApiParam("客户名称") + private String customerName; + + @Transient + @ApiParam("班次") + private String shiftName; + + @Transient + @ApiParam("班长") + private String squadLeader; } From 8dcb1703c91ce885e752268da9c0ac867228b88b Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 4 Dec 2020 11:29:31 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=A6=96=E6=A3=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 03c2cd2..e808b1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -125,7 +125,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Transient @ApiParam("检测值") - private String checkValue; + private String checkValue = ""; @Transient @ApiParam("质检单检测记录id")