From 5e229b7176cac1ca55cb4f29b0dc2ff39324ee00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Sep 2020 00:20:04 +0800 Subject: [PATCH 01/10] message pool --- .../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 538ba18..47d87e1 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 @@ -2596,7 +2596,8 @@ public class MesPcnEnumUtil { TIME_MODULE_START("timeModuleStart", "定时组件开始"), ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), - TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + MESSAGE_POOL("messagePool", "消息池"); private String value; private String description; From 676e43fc33f25f5fbbfb136fafea4bd255d9d973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Sep 2020 09:52:29 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=9D=A1=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index de9c87c..9c4f85b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2389,6 +2389,7 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; } From f1715db6644f4228eee37a57f48fb75b2c90b9fd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Sep 2020 11:37:00 +0800 Subject: [PATCH 03/10] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184=20?= =?UTF-8?q?06=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/MesPPMasterModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java new file mode 100644 index 0000000..7a612b3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 生产领料计划 + * @Reference : + * @Author : puxiao + * @CreateDate : 2020-09-10 19:50 + * @Modify: + **/ +@Data +public class MesPPMasterModel { + + @ApiParam("生产计划主数据") + private MesPpMaster mesPpMaster; + + @ApiParam("生产计划明细数据") + private List mesPpDetailsList; +} From b978fa390c61e9d3902014278ea8d4c1a902ce86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 11 Sep 2020 12:03:27 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=B6=82=E8=A3=85=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=E5=92=8C=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0333bea..3e688fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -161,6 +161,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } From 8a1f0c608e73e0ca536cad3876892385bf431f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Sep 2020 16:41:09 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=90=E5=9F=BA=E7=A1=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9B=BF=E4=BB=A3=E6=96=99=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++++++++ 3 files changed, 14 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 787e7a6..90cb863 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 @@ -1973,7 +1973,8 @@ public class MesEnumUtil { MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"), MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), - MES_LOCATION(570, "locationExcelService", "库位信息导入"); + MES_LOCATION(570, "locationExcelService", "库位信息导入"), + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index 05466cb..e5f1c82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -36,4 +36,7 @@ public class MesSubPart extends BaseBean implements Serializable { @ApiParam("替代料") private String subPartNo; + @Column(name = "SUB_FLAG") + @ApiParam("替代料标识") + private String subFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 3475f9a..889926f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3327,4 +3327,13 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) { + DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean); + DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); + return packBean; + } } From 3cf5c7077412ce1b9b910ae0d2e78a8da196ce1c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Sep 2020 18:12:34 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java index 7a612b3..87d933d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; - /** * @Description : 生产领料计划 * @Reference : @@ -22,5 +20,5 @@ public class MesPPMasterModel { private MesPpMaster mesPpMaster; @ApiParam("生产计划明细数据") - private List mesPpDetailsList; + private MesPpDetails mesPpDetails; } From b389da7c2fe56cf5efb3c7590d5d9c9b5d60d482 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 11 Sep 2020 22:39:17 +0800 Subject: [PATCH 07/10] Fix Bug #11260 --- .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 20 +++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index c695604..82bfdf1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -3,8 +3,10 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,8 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_STOCK_SCHEDULE") @Api("MES_库存排程配置") @@ -75,6 +79,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "STOCK_QTY") + @ApiParam("排程实时库存") + private Integer stockQty; + @Transient @ApiParam("物料名称") private String partName; 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 66a0859..8dc57e7 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 @@ -102,6 +102,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("客户产线代码") private String custProdLineCode; + @ApiParam("JIT排序号") + private String jitSeq; + private Integer status; public QueueOrderModel() { } @@ -309,7 +312,8 @@ public class QueueOrderModel implements Serializable { //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { + Double queueSeq, Double queDetailSeq, String partNo, + String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -320,6 +324,7 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; + this.serialNumber = serialNumber; } // getQueueOrderBySerialNumber @@ -332,4 +337,17 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.workType = workType; } + + // getQueueJitActualJitSeq + public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) { + this.id = id; + this.queueSeq = queueSeq; + this.serialNumber = serialNumber; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; + this.status = status; + } } From bd20bc1552597ecbfae2e8c8dd60abba5136ce78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 11 Sep 2020 22:52:35 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index d55e918..51dc163 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -350,6 +350,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("是否虚拟件") private Integer isFictive = 2; + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 15a259c8b2485ebd073c60ed710842575c247834 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 12 Sep 2020 14:51:51 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 16 ++++++++++++++++ .../i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index eb834de..942dfca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -195,6 +195,11 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Transient + @ApiParam("周总数") + private Integer weekRcCount; + + public WmsPOMaster() { } @@ -219,6 +224,17 @@ public class WmsPOMaster extends BaseBean { this.planTime = planTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 4f21a95..387aba1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; @ApiParam("小于今天的结果集") - private Map> ltCurrentDayResultMap; + private Map> ltCurrentDayResultMap; public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { From c947df6c6649791c2813c5e153bd8660c35bfd2e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 12 Sep 2020 18:27:22 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 25 ++++++-- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 3 + .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 2 +- .../i3plus/pojo/wms/modelbean/WmsAgvModel.java | 47 +++++++++++++++ .../i3plus/pojo/wms/modelbean/WmsPoCountModel.java | 67 ++++++++++++++++++++++ 5 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 7d1d04e..b0ac2ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -182,7 +182,7 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam(value = "版本") - private String version; + private Integer version; public WmsDocMovementSn(){} @@ -217,7 +217,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, - String whNo,String erpSrcNo,String version,Double sumQty) { + String whNo,String erpSrcNo,Integer version,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -242,7 +242,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String custNo, + Integer version,String whNo,String custNo, String erpSrcNo,String planDate,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; @@ -258,7 +258,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -271,7 +271,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -283,4 +283,19 @@ public class WmsDocMovementSn extends BaseBean { this.snStatus = snStatus; this.sumQty = sumQty; } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.erpSrcNo = erpSrcNo; + this.vendorNo = vendorNo; + this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; + this.planDate = planDate; + this.sumQty = sumQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 78806fe..1e55325 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -47,6 +49,7 @@ public class WmsMoveToERP extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name = "ORDER_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") @ApiParam(value = "状态", example = "0") public Integer orderStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index df864de..8bddf7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -169,7 +169,7 @@ public class WmsPartExtend extends BaseBean { private Integer qcPassCount; @Column(name = "LAST_QC_TIME") - @ApiParam(value = "上次质检时间") + @ApiParam(value = "首次质检时间合格") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lastQcTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java new file mode 100644 index 0000000..9a2ae7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : AGV接口Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-10 20:21 + * @Modify: + **/ +@Data +@Api("AGV接口Model") +public class WmsAgvModel { + + @ApiParam(value = "任务ID") + private String taskId; + + @ApiParam(value = "源库位") + private String srcLocateNo; + + @ApiParam(value = "目标库位") + private String destLocateNo; + + @ApiParam(value = "物料编号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "需求数量") + private Double qty; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "物料编号集合") + private List partNoList; + + @ApiParam(value = "目标库位编号集合") + private List destLocateNoList; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java new file mode 100644 index 0000000..432ab79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : PO明细回传汇总Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-12 13:56 + * @Modify: + **/ +@Data +@Api("PO明细回传汇总Model") +public class WmsPoCountModel { + + @ApiParam(value = "po单号") + private String poOrderNo; + + @ApiParam(value = "收货日期") + private String rcDate; + + @ApiParam(value = "源单号") + private String srcOrderNo; + + @ApiParam(value = "源行号") + private Integer srcItem; + + @ApiParam(value = "收货批次") + private String lotNo; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "仓库") + private String whNo; + + @ApiParam(value = "汇总数量") + private Double sumQty; + + @ApiParam(value = "供应商批次") + private String venLotNo; + + @ApiParam(value = "操作人") + private String user; + + public WmsPoCountModel() { + } + + public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) { + this.poOrderNo = poOrderNo; + this.rcDate = rcDate; + this.srcOrderNo = srcOrderNo; + this.srcItem = srcItem; + this.lotNo = lotNo; + this.partNo = partNo; + this.partName = partName; + this.whNo = whNo; + this.sumQty = sumQty; + this.venLotNo = venLotNo; + this.user = user; + } +}