From a844a4d59b3e1f83041bc9972d1ea2cb05358c46 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Nov 2020 22:07:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) 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 5f0f6bb..d34360f 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 @@ -359,6 +359,42 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { this.id = id; this.organizeCode = organizeCode; From ab0b8a2af11b48b2a1987bbbabd963a64352857c Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Tue, 3 Nov 2020 14:38:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BFsql=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 2a3156a..a84874b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -109,7 +109,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "窗口时间") - private Integer windowTime; + private String windowTime; @Transient @ApiParam(value = "紧急程度") @@ -318,6 +318,14 @@ public class WmsDocMovementDetails extends BaseBean { private Double snp; @Transient + @ApiParam(value = "订单总数量") + private Integer itemCount; + + @Transient + @ApiParam(value = "完成订单数量") + private Integer completeCount; + + @Transient @ApiParam(value = "条码总数量", example = "1") private Double detailsSnCount; @@ -444,27 +452,32 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; - public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty, - Double recQty,Double outQty,Integer itemStatus) { + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; this.planDate = planDate; this.planTime = planTime; - this.qty = qty; - this.pickQty = pickQty; - this.recQty= recQty; - this.outQty = outQty; this.itemStatus = itemStatus; this.projectNo = projectNo; this.partNo=partNo; } + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + + } - public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) { + + public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.itemStatus= itemStatus; + this.orderNo = orderNo; + this.partNo=partNo; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From c0abb5f994f9facd8e206f66f0f421720935de97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 3 Nov 2020 16:34:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=9012077=2019048-=E6=B3=A8=E5=A1=91?= =?UTF-8?q?=EF=BC=8C=E5=96=B7=E6=B6=82=EF=BC=8C=E7=BB=84=E8=A3=85=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=94=9F=E4=BA=A7=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=A0=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9?= =?UTF-8?q?-20201026=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 | 48 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) 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 9a7debb..113971f 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 @@ -363,14 +363,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer isFictive = 2; @Transient - @ApiParam("圈数") - private Integer rounds; - - @Transient - @ApiParam("小车号") - private String smallCarNo; - - @Transient @ApiParam("行颜色") private String rowColor; @@ -390,6 +382,46 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("生产节拍") private Integer takt; + /********************** 动态冗余字段（界面维护大写） *********************************/ + + @Transient + @ApiParam("基准时间") + private String standardDate; + + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("节拍") + private Integer chainSpeed; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + + @Transient + @ApiParam("小车数量") + private Integer smallCarAmount; + + @Transient + @ApiParam("标包") + private Integer standardPackage; + + @Transient + @ApiParam("包规代码") + private String packageGauge; + + @Transient + @ApiParam("反喷标识") + private String reverseSprayMark; + + @Transient + @ApiParam("模具编号集合") + private String mouldCodeList; + + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 46c22020bd33b6c8183848907190eb75dcb20d54 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 16:48:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E7=BC=BA=E9=99=B7=E5=A2=9E=E5=8A=A0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BB=A3=E7=A0=81?= 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 | 2 ++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 ++ 2 files changed, 4 insertions(+) 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 7188498..4d2d890 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 @@ -815,6 +815,8 @@ public class MesEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), 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 95ed07f..abfa556 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 @@ -445,6 +445,8 @@ public class MesPcnEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"),