From 1d86ce64294d1ca620762e700921377870d9a2d5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 18 Aug 2020 19:45:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=80=BB=E8=A3=85=E6=89=93=E5=8C=85=20?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B0=81=E7=AE=B1=E7=8A=B6=E6=80=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 809a892..7daee9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -69,6 +69,9 @@ public class ProdPackModel implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("是否封箱名称") + private String isSealedName; + public ProdPackModel() { } From 09b8ccd1e3f2997d13ef2b63e6204fb99103d98b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 18 Aug 2020 19:45:54 +0800 Subject: [PATCH 2/4] Fix Bug #10520 --- .../i3plus/pojo/mes/bean/MesProduceCategory.java | 4 ++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 17 +++++++++++++++-- .../i3plus/pojo/mes/model/StepPrintSnModel.java | 22 ++++++++++++++++++---- 5 files changed, 45 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index 853652c..dff6968 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -41,4 +41,8 @@ public class MesProduceCategory extends BaseBean implements Serializable { @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; + + @Column(name = "PRODUCE_CTGY_DESC") + @ApiParam("产品类型描述") + private String produceCategoryDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index c0251f8..56e17ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -86,6 +86,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("JIT排序号") private String jitSeq; + @Column(name = "JIA_SEQ") + @ApiParam("JIA排序号") + private String jiaSeq; + @Column(name = "SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; 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 efeeefb..382dd6a 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 @@ -120,6 +120,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("料架摆放位置") private String groupSide; + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + @Transient @ApiParam("Vin") private String vinCode; 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 b71500a..a3e4049 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 @@ -97,6 +97,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("配方内容") private String formulaContent; + @ApiParam("分组序号") + private String groupSeq; + public QueueOrderModel() { } @@ -180,7 +183,9 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) { + // getPrintSnQueueOrderModel + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -189,6 +194,12 @@ public class QueueOrderModel implements Serializable { this.prodCfgCode = prodCfgCode; this.isGroupPrinted = isGroupPrinted; this.jitActualNo = jitActualNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCategoryCode = produceCategoryCode; + this.qty = qty; + this.vinCode = vinCode; + this.queueSeq = queueSeq; + this.groupSeq = groupSeq; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -209,7 +220,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 produceCategoryCode) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String queueGroupNo, Integer groupNo) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -225,6 +236,8 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.pptCode = pptCode; this.produceCategoryCode = produceCategoryCode; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; } //getWaitQueueOrderModelNoSnMgn diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 7f07cff..e93626f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -92,14 +92,28 @@ public class StepPrintSnModel extends MesProduceSn { private String vinCode; @ApiParam("客户JIT生产队列排序号") private Double seq; - @ApiParam("jit车号") - private String jitCarNo; + @ApiParam("JIA排序号") + private String jiaSeq; + @ApiParam("JIP排序号") + private String jipSeq; @ApiParam("车型代码") private String carModuleCode; @ApiParam("上一个序列号") - private String lastQueDetailSeq; + private String lastSeq; + @ApiParam("第一个序列号") + private String firstSeq; + @ApiParam("序列架号") + private String serialFrameNum; + @ApiParam("DOCK") + private String dock; @ApiParam("包装数量") - private Integer pgCodeNum; + private Integer pgNum; + @ApiParam("数量") + private Integer num; + @ApiParam("客户工厂代码") + private String custPlantCode; + @ApiParam("产品类型描述") + private String produceCategoryDesc; @ApiParam("批次") private String lotNo; From d3ae797ba025a0d7a1b7207a62cd1fac43f0835f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 19 Aug 2020 15:00:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=91=20=E3=80=90=E8=B4=A8?= =?UTF-8?q?=E4=BF=9D=E5=91=A8=E6=9C=9F=E6=A3=80=E6=9F=A5=E7=BB=84=E4=BB=B6?= =?UTF-8?q?--=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 63e1e37..f965f02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -155,6 +155,18 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "生产批次") private String leftCode = ""; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("汇总数量") + private Double sumQty; + public WmsPoSn(){} @@ -163,4 +175,17 @@ public class WmsPoSn extends BaseBean { this.earliestReceTime = earliestReceTime; this.latestReceTime = latestReceTime; } + + public WmsPoSn(String orderNo,String erpSrcNo,String item,String partNo,String lotNo,String dateCode,String whNo, + String createDatetime,Double sumQty){ + this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; + this.item = item; + this.partNo = partNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.whNo = whNo; + this.createDatetime = createDatetime; + this.sumQty = sumQty; + } } From 5f495a1b98f64b5f7cfafc1f26106dd54c3bd866 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 19 Aug 2020 15:42:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index 1b57111..ed640d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -59,6 +59,4 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @ApiParam("工作中心名称") - private String workCenterName; }