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 1/5] =?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 2/5] 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 3/5] =?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") From 12520276852471531b20690765b4d91cb8767b1c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 16 Jul 2020 00:00:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?dl=E5=B0=8F=E6=9E=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesScatterPartProdCfg.java | 48 ++++++------- .../cn/estsh/i3plus/pojo/model/mes/PsetModel.java | 22 ++++++ .../pojo/model/mes/TorqueCollectionModel.java | 82 ++++++++++++++-------- 3 files changed, 99 insertions(+), 53 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java 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..308b6b8 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 @@ -86,37 +86,37 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("防错码长度") private Integer pokeYokeLength; - @Column(name = "PEST1") - @ApiParam("PEST编码1") - private String pest1; + @Column(name = "PSET1") + @ApiParam("PSET1") + private String pset1; - @Column(name = "PEST2") - @ApiParam("PEST编码2") - private String pest2; + @Column(name = "PSET2") + @ApiParam("PSET2") + private String pset2; - @Column(name = "PEST3") - @ApiParam("PEST编码3") - private String pest3; + @Column(name = "PSET3") + @ApiParam("PSET3") + private String pset3; - @Column(name = "PEST4") - @ApiParam("PEST编码4") - private String pest4; + @Column(name = "PSET4") + @ApiParam("PSET4") + private String pset4; - @Column(name = "PEST5") - @ApiParam("PEST编码5") - private String pest5; + @Column(name = "PSET5") + @ApiParam("PSET5") + private String pset5; - @Column(name = "PEST6") - @ApiParam("PEST编码6") - private String pest6; + @Column(name = "PSET6") + @ApiParam("PSET6") + private String pset6; - @Column(name = "PEST7") - @ApiParam("PEST编码7") - private String pest7; + @Column(name = "PSET7") + @ApiParam("PSET7") + private String pset7; - @Column(name = "PEST8") - @ApiParam("PEST编码8") - private String pest8; + @Column(name = "PSET8") + @ApiParam("PSET8") + private String pset8; @Column(name = "TORQUE_NO") @ApiParam("扭矩枪编号") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java new file mode 100644 index 0000000..9547b4c --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/7/15 21:43 + * @desc + */ +@Data +@AllArgsConstructor +public class PsetModel { + + private String psetName; + + private Integer psetNum; + + private Integer psetCount; + + private boolean torqueStatus; +} 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 cc36f93..b3cf6be 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 @@ -5,6 +5,10 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @Description : MES扭矩采集模型 @@ -38,37 +42,37 @@ public class TorqueCollectionModel implements Serializable { private String partName; @ApiParam("PEST编码1") - private Integer pest1; + private Integer pset1; @ApiParam("PEST编码2") - private Integer pest2; + private Integer pset2; @ApiParam("PEST编码3") - private Integer pest3; + private Integer pset3; @ApiParam("PEST编码4") - private Integer pest4; + private Integer pset4; @ApiParam("PEST编码5") - private Integer pest5; + private Integer pset5; @ApiParam("PEST编码6") - private Integer pest6; + private Integer pset6; @ApiParam("PEST编码7") - private Integer pest7; + private Integer pset7; @ApiParam("PEST编码8") - private Integer pest8; + private Integer pset8; @ApiParam("扭矩枪编号") private Integer torqueNo; @ApiParam("PEST号") - private Integer pestNum; + private Integer psetNum; @ApiParam("PEST数量") - private Integer pestCount; + private Integer psetCount; /** * 1-未采集， 2-已采集, 3-无需打扭矩 @@ -131,6 +135,11 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("是否大枪") private Integer isPf; + @ApiParam("psets总数") + private Integer psetSum; + + private Map psets = new LinkedHashMap<>(); + /** * 大枪查询结果构造方法 * @@ -175,34 +184,49 @@ public class TorqueCollectionModel implements Serializable { * @param colorCode * @param partNo * @param partName - * @param pest1 - * @param pest2 - * @param pest3 - * @param pest4 - * @param pest5 - * @param pest6 - * @param pest7 - * @param pest8 + * @param pset1 + * @param pset2 + * @param pset3 + * @param pset4 + * @param pset5 + * @param pset6 + * @param pset7 + * @param pset8 * @param torqueNo */ public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, - String colorCode, String partNo, String partName, Integer pest1, Integer pest2, - Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8, - Integer torqueNo) { + String colorCode, String partNo, String partName, Integer pset1, Integer pset2, + Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, + Integer torqueNo, Integer sendSeq, Integer checkScanCount) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; this.colorCode = colorCode; this.partNo = partNo; this.partName = partName; - this.pest1 = pest1; - this.pest2 = pest2; - this.pest3 = pest3; - this.pest4 = pest4; - this.pest5 = pest5; - this.pest6 = pest6; - this.pest7 = pest7; - this.pest8 = pest8; + this.pset1 = pset1; + this.pset2 = pset2; + this.pset3 = pset3; + this.pset4 = pset4; + this.pset5 = pset5; + this.pset6 = pset6; + this.pset7 = pset7; + this.pset8 = pset8; this.torqueNo = torqueNo; + this.sendSeq = sendSeq; + this.checkScanCount = checkScanCount; + assemblePsets(); } + + private void assemblePsets() { + psets.put("pset1", new PsetModel("pset1", 1, this.pset1, false)); + psets.put("pset2", new PsetModel("pset2", 2, this.pset2, false)); + psets.put("pset3", new PsetModel("pset3", 3, this.pset3, false)); + psets.put("pset4", new PsetModel("pset4", 4, this.pset4, false)); + psets.put("pset5", new PsetModel("pset5", 5, this.pset5, false)); + psets.put("pset6", new PsetModel("pset6", 6, this.pset6, false)); + psets.put("pset7", new PsetModel("pset7", 7, this.pset7, false)); + psets.put("pset8", new PsetModel("pset8", 8, this.pset8, false)); + } + } From 5d62ebf26f6439fc33c0e8a7757be4581fec98c2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 16 Jul 2020 10:39:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Finish=20Task=20#2424=20Cost:8h=202424=2007?= =?UTF-8?q?=201.2.3.7.1=E6=96=B0=E5=A2=9E=E6=A3=80=E6=9F=A5=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 ++++--- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) 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 0d6a7ec..d3a2c16 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 @@ -81,6 +81,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("备注") public String remark; + @Column(name = "LOT_NO") @ApiParam("批次编号") public String lotNo; @@ -168,9 +169,9 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; - @Column(name = "SRC_SN") - @ApiParam("原条码") - public String srcSn; + @Column(name = "SERIAl_SN") + @ApiParam("产品条码") + public String serialSn; @Transient @ApiParam("业务类型编码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index a3f367b..e13269d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -799,5 +799,15 @@ public class WmsStockSn extends BaseBean { this.color = color; } + public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) { + this.packageNo = packageNo; + this.qty = qty; + this.qualityDate = qualityDate; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + } + }