From 23e5b87cebb7626bbc90d92bdfe29a5f9320f50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 May 2021 13:38:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=9015607=2020027-PCN=E7=AB=AF=20-=20?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A1=E6=95=B0=20-20210429=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 0593668..78c3128 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 @@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkOrderType; + @Column(name = "ON_SITE_FREQUENCY") + @ApiParam("巡检次数") + private Integer onSiteFrequency = 0; + @Deprecated @ApiParam(value = "检测结果") @Transient From 177cdd0b6eb94b2c9ff40ecdea5d019e009e1541 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 11 May 2021 09:17:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AE=B9=E5=99=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 6d97bc5..31b6863 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -237,10 +237,10 @@ public class WmsStockSn extends BaseBean { // @ApiParam(value = "乐观锁", example = "1") // public Integer lockVersion; - @ApiParam("托盘(容器)类型编号") - @Column(name = "CT_CODE") + @ApiParam("容器编号") + @Column(name = "CT_NO") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String ctCode; + private String ctNo; @ApiParam(value = "仓库名称") @Transient