From 163d610265507b003e3bdf32d6e165ca03013695 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 30 Jul 2020 08:46:26 +0800 Subject: [PATCH 1/7] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 025d045..c7981a7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -72,6 +72,12 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "工厂代码") public String organizeCode; + @ApiParam(value = "是否展示删除按钮") + public Integer isShowDeleteButton; + + @ApiParam(value = "跳转后端请求") + public String actionUrl; + public WmsTaskInfoModel() { } From c8726638475eb20ce0160e191bbd74628bfa050f Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 4 Aug 2020 02:37:04 +0800 Subject: [PATCH 2/7] Finish Task #2080 Cost:8h --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 24 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) mode change 100644 => 100755 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.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 a0618cf..17ac869 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 @@ -307,7 +307,7 @@ public class WmsEnumUtil { public enum REC_STATUS_KANBAN { TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"), RECEIVING(20, "RECEIVING", "收货中"), - DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"), + DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟"), COMPLETED(40, "COMPLETED", "已完成"); private int value; @@ -1720,6 +1720,7 @@ public class WmsEnumUtil { public enum QC_STATUS { INSPECTION_FREE(10, "免检"), PENDING_QUALITY_INSPECTION(20, "待质检"), + DELAYED_NON_QC(40, "延迟"), QUALITY_INSPECTION_COMPLETED(30, "质检完成"); private int value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java old mode 100644 new mode 100755 index 2c30912..009c019 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -21,6 +21,7 @@ public class WmsJobParamModel implements Serializable { private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) + private String whereHql;//业务查询条件HQL public int getMinuteDiffVal() { return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0c358df..1bd27d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -259,6 +259,30 @@ public class WmsMoveMaster extends BaseBean { this.refSrc = refSrc; } + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.fixId = fixId; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; From fa4b1e09aae287d40ebd09210ac82cd082c18dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 14:47:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9d94855..974c7e4 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 @@ -170,7 +170,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, - String pokeYokeFix) { + String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -186,6 +186,7 @@ public class TorqueCollectionModel implements Serializable { this.isPf = isPf; this.qualifiedCount = qualifiedCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; } /** From ba3f5fde4d9aa9252c6feafcc76b827349a42377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 5 Aug 2020 18:08:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E6=80=BB=E8=A3=85=E3=80=81?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E3=80=81=E6=B3=A8=E5=A1=91=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 36 ++++++++++++++++++++++ .../pojo/mes/dbinterface/MesInterfaceEnumUtil.java | 3 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) 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 1e81a07..9d9f831 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 @@ -298,6 +298,42 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户物料号") private String customerPartNo; + @Transient + @ApiParam("客户物料名称") + private String customerPartName; + + @Transient + @ApiParam("客户物料颜色") + private String customerPartColor; + + @Transient + @ApiParam("项目名称") + private String prodCfgTypeName; + + @Transient + @ApiParam("颜色代码") + private String colorCode; + + @Transient + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Transient + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Transient + @ApiParam("计划报表标识") + private String reportFormCode; + + @Transient + @ApiParam("一检数量") + private Integer firstInspectionQty; + + @Transient + @ApiParam("二检数量") + private Integer secondInspectionQty; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java index b1355c7..409f31b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -10,7 +10,8 @@ public class MesInterfaceEnumUtil { WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), - MES2SAP(50, "MES2SAP", "MES --> SAP"); + MES2SAP(50, "MES2SAP", "MES --> SAP"), + SAP2MES(60, "SAP2MES", "SAP --> MES"); private int value; private String name; 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 d0caed6..ffe7ac6 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 @@ -205,6 +205,7 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); DdlPreparedPack.getOrderDefault(mesWorkOrder); return packBean; } From 8eade912c71f24857aceabd449c296bb7cb3c15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 20:00:51 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E8=BF=94=E4=BF=AE=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java index e29550d..fa938cc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -6,6 +6,12 @@ import lombok.Data; @Data public class TorqueReviewModel { + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("工作中心代码") + private String workCenterCode; + @ApiParam("工作单元代码") private String workCellCode; From 162e2d33d777e7a0ab82421abf511d26625ccd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 22:01:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 96d6044..16df925 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -180,6 +180,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Transient + @ApiParam("队列类型") + private Integer queueType; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } @@ -207,7 +211,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode, Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime, - String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) { + String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor, + String gradeCode,String assyNo,Integer queueType) { this.orderNo = orderNo; this.vinCode = vinCode; this.partNo = partNo; @@ -224,5 +229,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.produceColor = produceColor; this.gradeCode = gradeCode; this.assyNo = assyNo; + this.queueType = queueType; } } From f9061f5d270e1afe796f6d5aa4c1afc93098e2e3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 5 Aug 2020 22:47:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) 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 5b06475..78806fe 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 @@ -229,6 +229,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "jis料架号") private String queueGroupNo; + @Column(name = "CUST_ORDER_NO") + @ApiParam(value = "客户单号") + private String custOrderNo; + @Transient private Long shippingId;