From df125e71b9d786c690482b152c0d8b8089000556 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 15 Jul 2020 10:39:41 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] 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; +} From dffdf884710ed93f1a3075681c320071e718f0c3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 15 Jul 2020 20:36:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=909556=20=E6=AC=A7=E6=B4=B2-RFID?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=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/WmsRfidOperateRecord.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java index 7c99fe0..8efb843 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -40,8 +40,8 @@ public class WmsRfidOperateRecord extends BaseBean { @Column(name="OPERATE_TYPE") @ApiParam("操作类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE") public Integer operateType; @Column(name="SRC_LOCATE")