解决云箭新需求中模块和字段的变化 （托板、托盘功能等）

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/TrayMapper.xml

@@ -12,6 +12,7 @@
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="no" jdbcType="VARCHAR" property="no"/>
         <result column="brand" jdbcType="VARCHAR" property="brand"/>
+        <result column="num" jdbcType="INTEGER" property="num"/>
         <result column="specification" jdbcType="VARCHAR" property="specification"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
     </resultMap>
@@ -19,7 +20,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        name, no, brand, specification, status,positionSort
+        name, no, brand, num, specification, status,positionSort
     </sql>
 
     <!-- 分页 -->

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TrayPageDTO.java

@@ -1,6 +1,8 @@
 package com.github.zuihou.business.productionReadyCenter.dto;
 
 import java.time.LocalDateTime;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -23,6 +25,8 @@ import lombok.experimental.Accessors;
 import com.github.zuihou.common.constant.DictionaryType;
 import java.io.Serializable;
 
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
 /**
  * <p>
  * 实体类
@@ -75,4 +79,7 @@ public class TrayPageDTO implements Serializable {
     @Length(max = 4, message = "状态（1-启用0-停用）长度不能超过4")
     private String status;
 
+    @ApiModelProperty(value = "托盘数量")
+    private Integer num;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TraySaveDTO.java

@@ -75,6 +75,9 @@ public class TraySaveDTO implements Serializable {
     @Length(max = 4, message = "状态（1-启用0-停用）长度不能超过4")
     private String status;
 
+    @ApiModelProperty(value = "托盘数量")
+    private Integer num;
+
     private List<TrayPositionSaveDTO> trayPositionList;
 
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TrayUpdateDTO.java

@@ -80,5 +80,8 @@ public class TrayUpdateDTO implements Serializable {
     @Length(max = 4, message = "状态（1-启用0-停用）长度不能超过4")
     private String status;
 
+    @ApiModelProperty(value = "托盘数量")
+    private Integer num;
+
     private List<TrayPositionUpdateDTO> trayPositionList;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Tray.java

@@ -100,6 +100,11 @@ public class Tray extends Entity<Long> {
     @Excel(name = "状态（1-启用0-停用）")
     private String status;
 
+    @ApiModelProperty(value = "托盘数量")
+    @TableField(value = "num", condition = LIKE)
+    @Excel(name = "托盘数量")
+    private Integer num;
+
     /**
      * 夹紧位置
      */