From cdf8c79cce11c297265b15088b6186ff1ccde6f3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 9 Jul 2020 18:35:33 +0800 Subject: [PATCH 1/5] Fix Bug #9408 --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f271030..5f310b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable { this.finsihQty = finsihQty; this.qty = qty; this.orderNo = orderNo; - this.pptCode=pptCode; + this.pptCode = pptCode; + this.produceCategoryCode = produceCategoryCode; } + //getAlreadyQueueOrderModelNoSn - public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; - this.serialNumber=serialNumber; + this.serialNumber = serialNumber; } //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo @@ -251,7 +253,7 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; From ba6be2539033cdbabd36db78f5c21b857f4a24ca Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 9 Jul 2020 19:36:52 +0800 Subject: [PATCH 2/5] Finish Task #2080 Cost:8h --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 167 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 9 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 7 + .../i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java | 54 +++++++ 4 files changed, 237 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java 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 d298220..9a50363 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 @@ -300,6 +300,63 @@ public class WmsEnumUtil { } /** + * 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REC_STATUS_KANBAN { + TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"), + RECEIVING(20, "RECEIVING", "收货中"), + DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"), + COMPLETED(40, "COMPLETED", "已完成"); + + private int value; + private String code; + private String description; + + REC_STATUS_KANBAN(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 订单明细状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1649,6 +1706,42 @@ public class WmsEnumUtil { * 质检业务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + INSPECTION_FREE(10, "免检"), + PENDING_QUALITY_INSPECTION(20, "待质检"), + QUALITY_INSPECTION_COMPLETED(30, "质检完成"); + + private int value; + private String description; + + QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 质检业务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { CREATE(10, "新建"), FINISH(20, "处理中"), @@ -8454,4 +8547,78 @@ public class WmsEnumUtil { return null; } } + + /** + * 频次 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FREQUENCY { + ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"), + STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"), + TASK_GENERATE(30, "AMP", "AMP"); + + private int value; + private String code; + private String description; + + FREQUENCY(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static FREQUENCY codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 1f2f1d4..f6e866e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -16,6 +16,7 @@ import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 盘点单冻结信息 @@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; + /** + * 差异类型：10：盘平，20：盘亏，30盘赢 + */ + @Transient + @ApiParam("差异集合") + @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description") + public List differenceTypeList; + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 1878152..d0c88bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -284,6 +284,13 @@ public class WmsPart extends BaseBean { public Integer isRecycle; + @Column(name = "FREQUENCY") + @ApiParam(value = "频次", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY") + @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true) + private Integer frequency; + + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java new file mode 100644 index 0000000..f5f2c4a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-07-09 9:50 上午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出实体类") +public class WmsReceiptKanbanDto { + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "频次") + private String frequency; + + @ApiParam(value = "供应商名称") + private String verdorName; + + @ApiParam(value = "订单号") + private String orderNo; + + + @ApiParam(value = "道口") + private String dock; + + @ApiParam(value = "项目") + private String prodCfgTypeCode; + + @ApiParam(value = "窗口时间") + private String planDate; + + @ApiParam(value = "开始收货时间") + private String earliestReceTime; + + @ApiParam(value = "结束收货时间") + private String latestReceTime; + + @ApiParam(value = "收货状态") + private String receStatus; + + @ApiParam(value = "质检状态") + private String qcStatus; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} From 82158d82830c39a385c6c77952863e768f710410 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 9 Jul 2020 20:05:41 +0800 Subject: [PATCH 3/5] [bug 9238 9096] --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index c0d1436..3bfe3b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("是否执行 1=是 2=否") private Integer isActive; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 7eab5e8..5a75ba4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 8adee52..4d37f07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -73,6 +73,9 @@ public class StepModel implements Serializable { @ApiParam("参数代码") private String paramCode; + @ApiParam("工步展示名称") + private String stepDisplayName; + /** * 工作单元代码 */ @@ -83,7 +86,7 @@ public class StepModel implements Serializable { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -93,6 +96,7 @@ public class StepModel implements Serializable { this.processCode = processCode; this.stepSeq = stepSeq; this.paramCode = paramCode; + this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; } } From 8e99ae38e6bd69c69ee28a27d6bbd33f50b65703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 9 Jul 2020 21:51:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=A4=A9=E6=B4=A5bug?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 2e23a27..55b9a05 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 @@ -718,7 +718,7 @@ public class MesPcnEnumUtil { DEFECTED(20, "不合格"), SCRAPED(30, "报废"), DISMANTLED(40, "已拆解"), - PRE_CHECK(50, "待检测"); + PRE_CHECK(5, "待检测"); private int value; private String description; From 9a62fe0e06b895c6c1925940f45f2065cfcd3b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 10 Jul 2020 10:03:54 +0800 Subject: [PATCH 5/5] BUG#9302 --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9367fd1..d537b55 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") - @AnnoOutputColumn(hidden = true) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, dataSrc = "/impp/operate/sys-user/query-user-by-pager", searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") @@ -97,7 +96,6 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") - @AnnoOutputColumn(hidden = true) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, dataSrc = "/impp/operate/sys-user/query-user-by-pager", searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")