为订单信息和订单历史信息添加作废字段

优化apms接口注解
优化订单作废等相关操作数据逻辑

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-12-09
+ * @since 2021-12-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -73,7 +73,7 @@ public class OrderInfo extends Model<OrderInfo> {
     private Integer orderSource;
 
     /**
-     * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
+     * 状态：	0等待执行，1执行中，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -186,6 +186,12 @@ public class OrderInfo extends Model<OrderInfo> {
     @TableField("orther_b")
     private String ortherB;
 
+    /**
+     * 是否作废 1:正常 0:作废
+     */
+    @TableField("order_void")
+    private Integer orderVoid;
+
 
     public static final String ID = "id";
 
@@ -241,6 +247,8 @@ public class OrderInfo extends Model<OrderInfo> {
 
     public static final String ORTHER_B = "orther_b";
 
+    public static final String ORDER_VOID = "order_void";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-12-09
+ * @since 2021-12-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -73,7 +73,7 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
     private Integer orderSource;
 
     /**
-     * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
+     * 状态：	0等待执行，1执行中，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -162,6 +162,12 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
     @TableField("quantity")
     private Float quantity;
 
+    /**
+     * 是否作废 0：正常 ，1：作废
+     */
+    @TableField("order_void")
+    private Integer orderVoid;
+
 
     public static final String ID = "id";
 
@@ -209,6 +215,8 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
 
     public static final String QUANTITY = "quantity";
 
+    public static final String ORDER_VOID = "order_void";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml

@@ -27,13 +27,14 @@
         <result column="unit" property="unit" />
         <result column="weight" property="weight" />
         <result column="quantity" property="quantity" />
+        <result column="order_void" property="orderVoid"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code,
         order_no, old_order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des,
-        craft_ill, unit, weight, quantity
+        craft_ill, unit, weight, quantity, order_void
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml

@@ -31,13 +31,14 @@
         <result column="add_b" property="addB" />
         <result column="orther_a" property="ortherA" />
         <result column="orther_b" property="ortherB" />
+        <result column="order_void" property="orderVoid"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code,
         order_no, old_order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des,
-        craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b
+        craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b, order_void
     </sql>
 
 </mapper>