订单合并功能开发，临时提交

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -110,8 +110,6 @@ public class BaseOrder extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer delayTime;
 
-    private transient Date lastBegin;
-
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java

@@ -28,7 +28,6 @@ import javax.persistence.Table;
 @Table(name = "APS_SAFE_STOCK_ORDER")
 @Api("安全库存订单")
 public class SafeStockOrder extends BaseOrder {
-
     private static final long serialVersionUID = 5944067344390531794L;
 
     @Column(name="ORDER_STATUS")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason
+ * @ClassName: SupplyOrder
+ * @Description: 补充订单
+ * @date 2021-12-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_SUPPLY_ORDER")
+@Api("补充订单")
+public class SupplyOrder extends BaseOrder {
+    private static final long serialVersionUID = -5829272956141252627L;
+
+    @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
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+
+import cn.estsh.i3plus.pojo.aps.bean.SupplyOrder;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SupplyOrderRepository extends CrudRepository<SupplyOrder, Long> {
+}