Переглянути джерело

解决工装保存产线的问题

oyq28 3 роки тому
батько
коміт
6a9bd1bcb4

+ 2 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MToolClampMapper.xml

@@ -20,12 +20,13 @@
         <result column="expiry_date" jdbcType="INTEGER" property="expiryDate"/>
         <result column="num" jdbcType="INTEGER" property="num"/>
         <result column="join_date" jdbcType="VARCHAR" property="joinDate"/>
+        <result column="zone_id" jdbcType="BIGINT" property="zoneId"/>
         <result column="material_type" jdbcType="VARCHAR" property="materialType"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,join_date,factory,
+        id,create_time,create_user,update_time,update_user,join_date,factory,zone_id,
         no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type,org_id
     </sql>
 

+ 3 - 0
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MToolClampSaveDTO.java

@@ -103,4 +103,7 @@ public class MToolClampSaveDTO implements Serializable {
     @ApiModelProperty(value = "生产分厂")
     private String factory;
 
+    @ApiModelProperty(value = "产线")
+    private Long zoneId;
+
 }

+ 2 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MToolClamp.java

@@ -156,7 +156,7 @@ public class MToolClamp extends Entity<Long> {
     @Builder
     public MToolClamp(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,
                       String no, String name, String status, String model, RemoteData<String, String> category, String mapNo, int period,int expiryDate,
-                      int num, String joinDate, RemoteData<String, String> brand, String materialType,int synFlag) {
+                      int num, String joinDate, RemoteData<String, String> brand, String materialType,int synFlag, Long zoneId) {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;
@@ -175,6 +175,7 @@ public class MToolClamp extends Entity<Long> {
         this.materialType = materialType;
         this.num = num;
         this.synFlag = synFlag;
+        this.zoneId = zoneId;
     }
 
 }