From e97f49d8ee2813ff396f57fe04317a097042c21f Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 Oct 2021 09:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=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/aps/bean/InsertedOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 7 ++----- .../main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index a7e3134..69d804f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -46,10 +46,12 @@ public class InsertedOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 2b079df..8bdaf48 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -56,11 +56,6 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; - @Column(name="RECALC_COUNT") - @ApiParam(value ="是否重新计算数量") - @FieldAnnotation(defaultValue = "true") - private Boolean recalcCount; - @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -95,10 +90,12 @@ public class ProductOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="PRODUCT_ROUTING_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index d1118a1..c16400f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -43,10 +43,12 @@ public class SafeStockOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 88c8cfe..346d1ef 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -77,12 +77,12 @@ public class SalesOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="SERIAL_NUMBER")