From c286c3d319e36be90d50559415daed34324b75ec Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 9 Dec 2020 19:27:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index ac04bbd..b9836f9 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 @@ -456,7 +456,8 @@ public class MesPcnEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"), + SCAN_CT_NO_TYPE("SCAN_CT_NO_TYPE", "料架号扫描校验类型值"); private String value; private String description; From b09a09f70b75b6ab65f5d05e27d5c008ca9b2e04 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 9 Dec 2020 19:28:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9mes=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=20=E5=BC=82=E5=B8=B8=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=8D=E4=BD=8D=E9=97=AE=E9=A2=98=20bi?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/WorkOrderBiModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java new file mode 100644 index 0000000..b268328 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/12/9 19:09 + * @desc + */ +@Data +@NoArgsConstructor +@Api("bi的工单model") +public class WorkOrderBiModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名") + private String partName; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工单号") + private String workOrderNo; + + public WorkOrderBiModel(String partNo, String partName, String workCenterCode, String workOrderNo) { + this.partNo = partNo; + this.partName = partName; + this.workCenterCode = workCenterCode; + this.workOrderNo = workOrderNo; + } +} From 9cd011c6ca228579cedcd2cb97fe7ddf381899a2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 10 Dec 2020 04:04:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 8902313..70d8791 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -93,6 +93,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String basZoneNo; + @Transient + @ApiParam("状态") + @AnnoOutputColumn(hidden = true) + public Integer orderStatus; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -108,4 +113,17 @@ public class WmsCSRange extends BaseBean { this.partNo = partNo; this.partNameRdd = partNameRdd; } + + public WmsCSRange(String zoneNo, String locateNo) { + this.zoneNo = zoneNo; + this.locateNo = locateNo; + + } + + public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) { + this.orderNo = orderNo; + this.partNo = partNo; + this.zoneNo = zoneNo; + this.orderStatus = orderStatus; + } } From 23f24d297dc56fe507b2dcfec33900b7ae265079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Dec 2020 10:55:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(core):=E5=8D=95=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=9C=AA=E6=AD=A3=E5=B8=B8=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 1634410..a579c71 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 @@ -59,8 +59,7 @@ public class SysOrderNoRule extends BaseBean { @Column(name = "SERIAL_NO_LENGTH") @ApiParam(value = "流水号长度",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long serialNoLength; + private Integer serialNoLength; @Column(name = "IS_CYCLE") @ApiParam(value = "是否按日期循环", example = "1") From 4a120ca375cf02e57367a2b1bd9f83eb624eefff Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 10 Dec 2020 16:07:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?12736=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=AE=A1=E5=88=92=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=88=90=E5=8A=9F=EF=BC=8C=E4=BD=86=E6=98=AF=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=9C=8B=E5=88=B0=E5=AF=BC=E5=85=A5=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE-20201124?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../mes/model/MesControlPlanTemplateModel.java | 35 ++++++++++------------ 2 files changed, 18 insertions(+), 20 deletions(-) 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 fbe4029..04223e8 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 @@ -2099,7 +2099,8 @@ public class MesEnumUtil { MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), - MES_JISA(640, "jisaExcelService", "JISA导入"); + MES_JISA(640, "jisaExcelService", "JISA导入"), + MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java index df5b532..2b59554 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java @@ -6,16 +6,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.math.BigDecimal; -import java.util.List; - /** * @Description: 控制计划导入模板 * @CreateDate: 2020/9/29 * @Author: simon.song */ @Data -@Api(value="控制计划导入模板",description = "控制计划导入模板") +@Api(value = "控制计划导入模板", description = "控制计划导入模板") public class MesControlPlanTemplateModel extends BaseBean { private static final long serialVersionUID = 6846982556729401884L; @@ -40,25 +37,25 @@ public class MesControlPlanTemplateModel extends BaseBean { @AnnoOutputColumn private String custName; - @ApiParam("控制计划版本号") - @AnnoOutputColumn - private Integer controlPlanVersion; - - @ApiParam("是否启用") - @AnnoOutputColumn - private Integer isEnable; +// @ApiParam("控制计划版本号") +// @AnnoOutputColumn +// private Integer controlPlanVersion; -// @Column(name = "IS_ENABLE") // @ApiParam("是否启用") +// @AnnoOutputColumn // private Integer isEnable; + + /** + * 中航质量标准明细表 + */ @ApiParam("工作单元代码") @AnnoOutputColumn private String workCellCode; - @ApiParam("质量标准版本") - @AnnoOutputColumn - private Integer qualityStandardVersion; +// @ApiParam("质量标准版本") +// @AnnoOutputColumn +// private Integer qualityStandardVersion; //检测类型：10=首检，20=巡检，30=终检，40=发运检 @ApiParam("检测类型") @@ -87,11 +84,11 @@ public class MesControlPlanTemplateModel extends BaseBean { @ApiParam("是否允许让步") @AnnoOutputColumn - private String isConcession; + private Integer isConcession; @ApiParam("间隔时间") @AnnoOutputColumn - private String checkInterval; + private Integer checkInterval = 0; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @ApiParam("个数标识") @@ -119,11 +116,11 @@ public class MesControlPlanTemplateModel extends BaseBean { @ApiParam("公差上限") @AnnoOutputColumn - private BigDecimal differenceMaxLimit; + private Double maximum = 0d; @ApiParam("公差下限") @AnnoOutputColumn - private BigDecimal differenceMinLimit; + private Double minimum = 0d; @ApiParam("是否关键检测项") @AnnoOutputColumn