From 0cf4d5742d446e1eda7fd32484c451789505f55f Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Sat, 20 Nov 2021 16:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java  | 28 ++++++++++++++++++++++
 .../i3plus/pojo/base/enumutil/ApsEnumUtil.java     |  5 ++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
index 36954ae..87689a5 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EParentWork;
+import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -43,6 +44,11 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Integer serialNumber = 0;
 
+    @Column(name="NEW_SERIAL")
+    @ApiParam(value ="拆分工作流水号")
+    @FieldAnnotation(property = false)
+    private Boolean newSerial = false;
+
     @Column(name="PRODUCT_ORDER_ID")
     @ApiParam(value ="订单")
     @FieldAnnotation(property = false)
@@ -53,6 +59,28 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operationId;
 
+    public int getCodeNumber() {
+        for (int bitIndex = 0; bitIndex < 10; ++bitIndex) {
+            int value = 1 << bitIndex;
+            if ((this.serialNumber & value) == 0) {
+                this.serialNumber |= value;
+                newSerial = true;
+                return bitIndex;
+            }
+        }
+
+        return 0;
+    }
+
+    public void recoverNumber(int value) {
+        if (newSerial == null || !newSerial) {
+            return;
+        }
+
+        value = ~(1 << value);
+        this.serialNumber &= value;
+    }
+
     public BaseOrder getProductOrder() {
         return BeanRelation.get(this, EParentWork.ProductOrder);
     }
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 57d208b..ace9378 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
@@ -1179,14 +1179,15 @@ public class ApsEnumUtil {
     public enum SANLUX_OPERATION_TYPE {
         NORMAL("NORMAL", "正常工序"),
         FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"),
-        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"),
+        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间自动牵纱"),
         FOUR_COATING("FOUR_COATING", "四车间覆胶"),
         FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"),
         TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"),
         TWO_MOLDING("TWO_MOLDING", "二车间成型"),
         TWO_COATING("TWO_COATING", "二车间覆胶"),
         TWO_WRAPPING("TWO_WRAPPING", "二车间包布"),
-        TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱");
+        TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"),
+        FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱");
 
         private final String value;
         private final String description;