From 1c93d2181511f4dfe13cec3ea4dec45c599055c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 14 Jul 2020 18:37:53 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5BIN=5FN?= =?UTF-8?q?O?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) 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 336731e..e540c1a 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 @@ -4331,4 +4331,50 @@ public class MesPcnEnumUtil { return valueOf(val); } } + + /** + * MES_产品颜色 类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_COLOR_TYPE { + + PRODUCT_COLOR(10, "产品颜色"), + MATERIAL_COLOR(20, "物料颜色"); + + private int value; + private String description; + + MES_COLOR_TYPE(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index 001ffe6..6e95a4a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -47,7 +47,7 @@ public class IfPickData extends BaseBean implements Serializable { @ApiParam("物料编号") private String partNo; - @Column(name = "BIN位代码") + @Column(name = "BIN_NO") @ApiParam("物料编号") private String binNo; From cc4d17a81f94837ccd1aadc7df4c553e653722da Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 14 Jul 2020 23:03:20 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A4=A7=E6=9E=AAok=20bug=209492?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index c0251f8..47cd239 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("排序号") - private Double seq; + private String seq; @Column(name = "STATUS") @ApiParam("状态") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 5a874ab..cc36f93 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -112,6 +112,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("实际合格数") private Double actualQualifiedCount; + @ApiParam("是否已经发送了新的组合码") + private boolean hasSendAsciiWhenYellow; + @ApiParam("工步信息行颜色") private String color; From 538b224f67f198802d726127605c22b920d929b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 15 Jul 2020 00:31:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=A4=96=E6=9D=A1=E7=A0=81=E8=AF=86=E5=88=AB=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?-PCR=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/OnLineSnModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java new file mode 100644 index 0000000..94d0db4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class OnLineSnModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("用户信息") + private String userInfo; + +} From ec87065eb56edccefc185ecda5b879d3b1a034d1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 15 Jul 2020 09:19:36 +0800 Subject: [PATCH 4/8] if pick data --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index 6e95a4a..e3bf5e0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -48,7 +48,7 @@ public class IfPickData extends BaseBean implements Serializable { private String partNo; @Column(name = "BIN_NO") - @ApiParam("物料编号") + @ApiParam("BIN位代码") private String binNo; @Column(name = "QTY") From 860f6d11f07e460d0da182780b5c592ef72efe10 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Jul 2020 09:31:26 +0800 Subject: [PATCH 5/8] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 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 e1371ad..02188d9 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 @@ -194,7 +194,8 @@ public class WmsEnumUtil { SUB(20, "SUB", "委外采购"), TAR(30, "TAR", "多角贸易采购"), TAP(40, "TAP", "多角代采购"), - AMP(50, "AMP", "AMP收货"); + AMP(50, "AMP", "AMP收货"), + INNER(60, "INNER", "内部收货"); private int value; private String code; @@ -790,7 +791,8 @@ public class WmsEnumUtil { CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"), CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"), AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"), - FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"); + FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"), + INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"); private int value; private String code; private String description; From df125e71b9d786c690482b152c0d8b8089000556 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 15 Jul 2020 10:39:41 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 1a11e38..0d6a7ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : 库存移动单条码信息 @@ -163,6 +168,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "SRC_SN") + @ApiParam("原条码") + public String srcSn; + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") From 300e308394c5f420ee7a156d06a3e26fec1b75e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 15 Jul 2020 15:36:46 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B2=E6=A3=80?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= 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 e0b81de..c2cf91f 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 @@ -1965,7 +1965,8 @@ public class MesEnumUtil { ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"), SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), - MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"); + MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), + BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"); private int value; private String service; From b69fcdc0c665d244ec0fb53289a6a907f63c6384 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 15 Jul 2020 18:49:38 +0800 Subject: [PATCH 8/8] Finish Task #2399 Cost:6h --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 +++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 5 +++-- .../i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/model/SoapModel.java | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.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 c2cf91f..fc9ae03 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 @@ -6741,6 +6741,15 @@ public class MesEnumUtil { return tmp; } + public static QAD_DATA_OBJECT getByObjectCode(String objectCode) { + for (QAD_DATA_OBJECT qadDataObject : values()) { + if (qadDataObject.getObjectCode().equals(objectCode)) { + return qadDataObject; + } + } + return null; + } + public static QAD_DATA_OBJECT getByCode(String code) { for (QAD_DATA_OBJECT qadDataObject : values()) { if (qadDataObject.getCode().equals(code)) { 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 e540c1a..a9d036e 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 @@ -3763,8 +3763,9 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VERIFY_MODE { - PART_NO("10", "按物料号匹配"), - WORK_CENTER_CODE("20", "按产线匹配"); + PART_NO_BY_BOM("10", "按物料号匹配By-Bom"), + WORK_CENTER_CODE_BY_BOM("20", "按产线匹配By-Bom"), + WORK_CENTER_CODE_BY_SCATTER("30", "按产线匹配By-Scatter"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index ffdb270..cec7195 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -169,4 +169,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "QUALIFIED_COUNT") @ApiParam("应收合格数") private Double qualifiedCount; + + @Column(name = "IS_CHECK") + @ApiParam("是否复核校验") + private Integer isCheck; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java new file mode 100644 index 0000000..dd94176 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/15 1:35 下午 + * @Modify: + */ +@Data +public class SoapModel { + + private String soapJson; + + private List> soapList; +}