From 65a2e93daec754b11a74ad87bf937e0ef597ba79 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 26 Jun 2021 07:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81=E6=8B=86?= =?UTF-8?q?=E5=88=86=E8=BE=93=E5=85=A5=EF=BC=8C=E8=BE=93=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 12 ++++++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 7aa3c0a..f57b2ac 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -45,6 +45,10 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="最小加工批量") private Integer minProductBatch; + @Column(name="FIX_PLAN") + @ApiParam(value ="固定组炉的计划") + private Boolean fixPlan; + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } } 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 2b43199..a7e3134 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 @@ -48,6 +48,10 @@ public class InsertedOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + private Double qualifiedCount; + @Column(name="REMARK") @ApiParam(value ="备注") private String remark; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index 968e93e..b4cdff2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -34,6 +34,10 @@ public class OrderFeedback extends BaseAPS { @FieldAnnotation(relation = "Order", modify = false) private Long orderId; + @Column(name="ORDER_COUNT") + @ApiParam(value ="订单数量") + private Double orderCount; + @Column(name="DELIVER_RATE") @ApiParam(value ="发货百分比") private Double deliverRate; @@ -42,10 +46,6 @@ public class OrderFeedback extends BaseAPS { @ApiParam(value ="成品合格百分比") private Double qualifiedRate; - @Column(name="INVENTORY_COUNT") - @ApiParam(value ="库存扣减数量") - private Double inventoryCount; - @Column(name="UNQUALIFIED_COUNT") @ApiParam(value ="不良数量") private Double unqualifiedCount; 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 14bb66a..46f2e1f 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 @@ -83,10 +83,10 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; - @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") - @ApiParam(value ="多余量") - @FieldAnnotation(modify = false) - private Double excessCount; +// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") +// @ApiParam(value ="多余量") +// @FieldAnnotation(modify = false) +// private Double excessCount; @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="缺少量") @@ -102,6 +102,10 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + private Double qualifiedCount; + @Column(name="PRODUCT_ROUTING_ID") @ApiParam(value ="工艺路线") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index bee905c..f1a6064 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -50,10 +50,10 @@ public class PurchaseOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; - @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") - @ApiParam(value ="多余量") - @FieldAnnotation(modify = false) - private Double excessCount; +// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") +// @ApiParam(value ="多余量") +// @FieldAnnotation(modify = false) +// private Double excessCount; @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") 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 0e9fa45..d1118a1 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 @@ -45,6 +45,10 @@ public class SafeStockOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + private Double qualifiedCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); 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 82607d8..971821b 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 @@ -69,6 +69,10 @@ public class SalesOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + private Double qualifiedCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 4125b4d..fa58935 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -120,7 +120,7 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="打印时间") private Date printTime; - @ApiParam(value ="生产结束时间") + @ApiParam(value ="资源生产结束") @FieldAnnotation(display = false) @Transient @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")