From d0553746133788d6762f3b83130e66ad0288d585 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 20 Sep 2020 11:11:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2SQL=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac880ab..398154c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } From 0c93ee587787071010ea290b968d430506b18438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 20 Sep 2020 11:19:14 +0800 Subject: [PATCH 2/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=E6=94=B9=E7=9C=8B=E6=9D=BF=E5=92=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=89=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index bcac673..05301f8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -394,6 +394,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); } + if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); } From 16a2d75a1720660c15f5fcc148a2dbd8c2de008f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sun, 20 Sep 2020 11:20:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5job=E7=9A=84sqlserver=E4=B8=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac880ab..398154c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } From d5e356938ee53b5ca1561b805636811c442768c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 20 Sep 2020 16:59:54 +0800 Subject: [PATCH 4/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=E6=94=B9=E7=BB=84=E6=89=98=E6=89=93=E5=8D=B0?= =?UTF-8?q?=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/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index c809906..4c1f98a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -156,6 +156,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("明细总数") private Integer detailTotal = 0; + @Transient + @ApiParam("托包规数量") + private Double qty2; + public MesPackage() { } 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 772a97b..b9a1af3 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 @@ -206,6 +206,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("电检结果") private String electricResult; + @Transient + @ApiParam("包规数量") + private Double packageQty; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1")