From 8a4698bfe76bf300b5549cc86adcbba34a70a043 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 19 Apr 2021 13:22:51 +0800 Subject: [PATCH 1/7] =?UTF-8?q?15284=2019108+=20MES=E6=97=A0=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index ef86497..f946878 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -248,6 +248,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("组内编号") private Integer groupNo; + @Transient + @ApiParam("总数") + private long sumQty; + public MesProduceSn() { } @@ -257,6 +261,14 @@ public class MesProduceSn extends BaseBean implements Serializable { this.qty = qty; } + + public MesProduceSn(String workCenterCode, String partNo, String partNameRdd, long sumQty) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sumQty = sumQty; + } + public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus, Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode, String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo, From 10ad3e54bbfe87b6dc222e1726a96f278ef4ebd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 19 Apr 2021 15:43:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=9015332=2020027-PCN=E7=AB=AF=20-=20?= =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C-=20=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8A=A5=E9=94=99=20-20210421?= =?UTF-8?q?=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/bean/MesQcOrderDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 0cbb6c3..f6d51c4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -78,11 +78,11 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("数量") - private Integer qty; + private Integer qty = 0; @Column(name = "FINISH_QTY") @ApiParam("已检数量") - private Integer finishQty; + private Integer finishQty = 0; @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") @ColumnDefault("0") From 57a9a8b4fdf72aac5059a7c03223f76a60cd0d31 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 20 Apr 2021 10:15:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=9015334=2019108+wms=5Fdoc=5Ffg=5Fdet?= =?UTF-8?q?ail=E5=88=B0=E5=BA=93=E5=AD=98=E6=89=A7=E8=A1=8C=E6=8C=89?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E5=A4=84=E7=90=86+0419=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/model/wms/WmsJobParamModel.java | 1 + 1 file changed, 1 insertion(+) 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 index 5a6f7f2..a0fdfdf 100755 --- 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 @@ -28,6 +28,7 @@ public class WmsJobParamModel implements Serializable { private Integer erpSyncFlag;//查询SHIPPING表的条件 private String filterZoneNos;//过滤存储区 private String zoneNos;//存储区 + private String lineNo;//产线 public int getMinuteDiffVal() { From a691cded533b947521f50a8ee949b14a7972b801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 20 Apr 2021 16:45:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=9015381=2020027--MES=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2BH=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=A6=96=E3=80=81=E4=B8=AD=E3=80=81=E6=9C=AB?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=9E=E6=97=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E6=95=85=E9=9C=80=E8=A6=81=E8=B7=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AE=9E=E7=8E=B0=E5=85=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=88=E6=9E=9C-2021-04-23=E3=80=91=20?= =?UTF-8?q?=E3=80=9015197=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=A6=96=E6=A3=80=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8-=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=8C=89=E7=85=A7=E5=B7=A5=E5=8D=95=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=A6=96=E6=A3=80-20210421=20=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/bean/MesQcOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index fc1d9db..514a5bc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -159,4 +159,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient @ApiParam("班长") private String squadLeader; + + @Transient + @ApiParam("质检单集合") + private List orderNoList; } From 505f80032c0d6e39c8cbed927f0b9d12c7e77b59 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 20 Apr 2021 19:52:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8a218f9..a571907 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3218,6 +3218,9 @@ public class WmsHqlPack { public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + if (details.getIsRequire() != null) { + DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result); + } getStringBuilderPack(details, result); return result; } From 9ed1a5d36ada3ee45617e32b4b5bcbfada2b8915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Wed, 21 Apr 2021 10:02:57 +0800 Subject: [PATCH 6/7] =?UTF-8?q?15241=2019081=20=E2=80=94=E2=80=94=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E8=B4=A7=E8=BF=9B=E5=BA=A6=E6=8A=A5=E8=A1=A8=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=9C=80=E6=8E=92=E5=BA=8F=EF=BC=8C2021-04-17=2015108=2019048-?= =?UTF-8?q?-=20=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=88=B0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20--20210417?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 2ae023d..25b4bb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -250,6 +250,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", public Integer lockVersion; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient @ApiParam("项目代码") private String prodCfgTypeCode; 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 838218f..6312a19 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 @@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient @ApiParam("明细状态") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) private String itemStatus; 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 889e64c..b194f43 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 @@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean { private String ZoneNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + + @Transient @ApiParam("交易类型名称") private String transTypeName; From 62ae1d9a134f2d1b46e20b427fb6bcee7710095e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 21 Apr 2021 11:11:36 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9EqrCode=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=8D=A1=E6=96=AF=E9=A9=AC=E6=8A=A5=E8=A1=A8=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=B7=A5=E5=BA=8F=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2?= =?UTF-8?q?CMS=E6=A0=87=E7=AD=BE=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 27b88aa..b463dcc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "FN_LOCATION_NO") @ApiParam("炉内位置代码") private String fnLocationNo; + + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; }