逻辑优化

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Description :删除订单历史表
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2022-07-13 11:03
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_DELETE_ORDER_HISTORY")
+@Api("删除订单历史表")
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class DeleteOrderHistory extends BaseBean {
+    @Column(name="TOP_ORDER")
+    @ApiParam(value ="顶层订单号")
+    private String topOrder;
+}

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

@@ -60,6 +60,11 @@ public class InsertedOrder extends BaseOrder  {
     @ApiParam(value ="备注")
     private String remark;
 
+    @Column(name="FORCE_COUNT")
+    @ApiParam(value ="强制完成数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
+    private Double forceCount;
+
     @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EInsertedOrder.ProductRouting);

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

@@ -93,6 +93,11 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(property = false)
     private Integer serialNumber = 0;
 
+    @Column(name="FORCE_COUNT")
+    @ApiParam(value ="强制完成数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
+    private Double forceCount;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.DeleteOrderHistory;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2022-07-13 11:29
+ * @Modify:
+ **/
+@Repository
+public interface DeleteOrderHistoryRepository extends JpaRepository<DeleteOrderHistory, Long> {
+}