Merge remote-tracking branch 'origin/master' into master

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

@@ -25,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias
+        id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias,meterial_id,
         audit_status, parent_id, name, no, status, model, brand, specification, module_id,materialBrandName,version
     </sql>
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ZZoneMapper.xml

@@ -11,6 +11,7 @@
         <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
         <result column="run_mode" jdbcType="VARCHAR" property="runMode"/>
         <result column="layout_map" jdbcType="VARCHAR" property="layoutMap"/>
+        <result column="org_id" jdbcType="VARCHAR" property="orgId"/>
         <result column="no" jdbcType="VARCHAR" property="no"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
@@ -25,7 +26,7 @@
         select
         <include refid="Base_Column_List"/>
         from (SELECT
-        z.*,productionResourceName,a.productionResourceCount, u.name as createUserName,u.org_id,f.url as img_url
+        z.*,productionResourceName,a.productionResourceCount, u.name as createUserName,f.url as img_url
         FROM
         imcs_z_zone z
         LEFT JOIN (

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ZZonePageDTO.java

@@ -77,4 +77,7 @@ public class ZZonePageDTO implements Serializable {
     @Length(max = 4, message = "状态（1-启用0-停用）长度不能超过4")
     private String status;
 
+    @ApiModelProperty(value = "部门ID")
+    private Long orgId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ZZoneSaveDTO.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.productionResourceCenter.dto;
 
+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;
@@ -72,4 +73,7 @@ public class ZZoneSaveDTO implements Serializable {
     @Length(max = 255, message = "布局图长度不能超过255")
     private String layoutMap;
 
+    @ApiModelProperty(value = "部门ID")
+    private Long orgId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ZZoneUpdateDTO.java

@@ -90,4 +90,7 @@ public class ZZoneUpdateDTO implements Serializable {
 
     @ApiModelProperty(value = "生产资源列表")
     private List<String> resourceList;
+
+    @ApiModelProperty(value = "部门ID")
+    private Long orgId;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/ZZone.java

@@ -1,30 +1,22 @@
 package com.github.zuihou.business.productionResourceCenter.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.github.zuihou.base.entity.Entity;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.zuihou.injection.annonation.InjectionField;
+import com.github.zuihou.model.RemoteData;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import lombok.*;
+import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
+
 import java.time.LocalDateTime;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import com.github.zuihou.common.constant.DictionaryType;
-import static com.github.zuihou.utils.DateUtils.DEFAULT_DATE_TIME_FORMAT;
 
 import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+import static com.github.zuihou.common.constant.InjectionFieldConstants.ORG_ID_CLASS;
+import static com.github.zuihou.common.constant.InjectionFieldConstants.ORG_ID_METHOD;
 
 /**
  * <p>
@@ -95,6 +87,11 @@ public class ZZone extends Entity<Long> {
     @Excel(name = "布局图")
     private String layoutMap;
 
+    @ApiModelProperty(value = "部门ID")
+    @TableField(value = "org_id", condition = LIKE)
+    @Excel(name = "部门ID")
+    private Long orgId;
+
     @TableField(exist=false)
     private String imgUrl;
 
@@ -110,7 +107,7 @@ public class ZZone extends Entity<Long> {
 
     @Builder
     public ZZone(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
-                    String no, String name, String remark) {
+                    String no, String name, String remark, Long orgId) {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;
@@ -119,6 +116,7 @@ public class ZZone extends Entity<Long> {
         this.no = no;
         this.name = name;
         this.remark = remark;
+        this.orgId = orgId;
     }
 
 }