From d69c8e682b4c66071fee6093f8dbdd08ecda968b Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Sun, 8 Aug 2021 10:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E4=B8=8B=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java  | 17 ++++++++++++++
 .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java   |  4 ++++
 .../i3plus/pojo/base/enumutil/ApsEnumUtil.java     | 26 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)

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 971821b..88c8cfe 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
@@ -61,18 +61,35 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(defaultValue = "WAITING")
     private ApsEnumUtil.SALES_ORDER_STATUS orderStatus;
 
+    @Column(name="ORDER_SPLIT")
+    @ApiParam(value ="拆分下发")
+    @FieldAnnotation(defaultValue = "NONE", modify = false)
+    private ApsEnumUtil.SALES_ORDER_SPLIT_STATUS orderSplit = ApsEnumUtil.SALES_ORDER_SPLIT_STATUS.NONE;
+
+    @Column(name="CAN_MAT_CALC")
+    @ApiParam(value ="是否参与物料运算")
+    @FieldAnnotation(defaultValue = "1")
+    private Boolean canMatCalc = true;
+
     @Column(name="DELIVER_RATE")
     @ApiParam(value ="发货百分比")
     private Double deliverRate;
 
     @Column(name="FINISH_COUNT")
     @ApiParam(value ="完工数")
+    @FieldAnnotation(modify = false)
     private Double finishCount;
 
     @Column(name="QUALIFIED_COUNT")
     @ApiParam(value ="检验合格数量")
+    @FieldAnnotation(modify = false)
     private Double qualifiedCount;
 
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam(value ="拆分订单流水号")
+    @FieldAnnotation(property = false)
+    private Integer serialNumber = 0;
+
     @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/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 4dc3873..e7571fd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -171,6 +171,10 @@ public class Work extends BaseAPS {
     @ApiParam(value ="动态拆分工作ID")
     private Long originWorkId;
 
+    @Column(name="SUPPLY_WORK_CODE")
+    @ApiParam(value ="补满模工作编码")
+    private String supplyWorkCode;
+
     @ApiParam(value ="工作左边界")
     private Date leftEdge;
 
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 9f9e6b2..f5e3f69 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -1183,6 +1183,32 @@ public class ApsEnumUtil {
     }
 
     /**
+     * 销售订单拆分下发
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SALES_ORDER_SPLIT_STATUS {
+        NONE("NONE", "不拆分下发"),
+        SPLIT_MAIN("SPLIT_MAIN", "拆分下发（主）"),
+        SPLIT_CHILD("SPLIT_CHILD", "拆分下发（子）");
+
+        private String value;
+        private String description;
+
+        SALES_ORDER_SPLIT_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 库存订单状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)