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

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BBomServiceImpl.java

@@ -99,6 +99,7 @@ public class BBomServiceImpl extends SuperServiceImpl<BBomMapper, BBom> implemen
             }
         }
         if(StrUtil.isNotEmpty(fields)){
+            fields += " 1 as bomNum,";
             fields = fields.substring(0,fields.length()-1);
             //所有的一级
             String sql = custService.getSelectFixSQL(BizConstant.DYNFORM_BIZ_TYPE_BOM)+fields+",(case when a.audit_status='0' then '新增' " +

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

@@ -14,6 +14,14 @@
         <result column="box_id" jdbcType="BIGINT" property="boxId"/>
         <result column="type" jdbcType="VARCHAR" property="type"/>
         <result column="module_id" jdbcType="VARCHAR" property="moduleId"/>
+        <result column="capital_no" jdbcType="VARCHAR" property="capitalNo"/>
+        <result column="capital_name" jdbcType="VARCHAR" property="capitalName"/>
+        <result column="capital_type" jdbcType="VARCHAR" property="capitalType"/>
+        <result column="mode_specification" jdbcType="VARCHAR" property="modeSpecification"/>
+        <result column="capital_price" jdbcType="VARCHAR" property="capitalPrice"/>
+        <result column="production_date" jdbcType="VARCHAR" property="productionDate"/>
+        <result column="production_no" jdbcType="VARCHAR" property="productionNo"/>
+        <result column="manufacturer" jdbcType="VARCHAR" property="manufacturer"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
@@ -28,7 +36,7 @@
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
         tenant_id, productionline_id, box_id, type, category, module_id, name, code, status, remark, resources_type,resources_category,lineDesc,moduleDesc,tenantDesc,pic,
-        ip,port
+        ip,port,capital_no,capital_name,capital_type,mode_specification,capital_price,production_date,production_no,manufacturer
     </sql>
 
     <!-- 分页 -->

imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceMapper.xml

@@ -14,6 +14,14 @@
         <result column="box_id" jdbcType="BIGINT" property="boxId"/>
         <result column="type" jdbcType="VARCHAR" property="type"/>
         <result column="module_id" jdbcType="VARCHAR" property="moduleId"/>
+        <result column="capital_no" jdbcType="VARCHAR" property="capitalNo"/>
+        <result column="capital_name" jdbcType="VARCHAR" property="capitalName"/>
+        <result column="capital_type" jdbcType="VARCHAR" property="capitalType"/>
+        <result column="mode_specification" jdbcType="VARCHAR" property="modeSpecification"/>
+        <result column="capital_price" jdbcType="VARCHAR" property="capitalPrice"/>
+        <result column="production_date" jdbcType="VARCHAR" property="productionDate"/>
+        <result column="production_no" jdbcType="VARCHAR" property="productionNo"/>
+        <result column="manufacturer" jdbcType="VARCHAR" property="manufacturer"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
@@ -28,7 +36,7 @@
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
         tenant_id, productionline_id, box_id, type, category, module_id, name, code, status, remark, resources_type,resources_category,lineDesc,moduleDesc,tenantDesc,pic,
-        ip,port
+        ip,port,capital_no,capital_name,capital_type,mode_specification,capital_price,production_date,production_no,manufacturer
     </sql>
 
     <!-- 分页 -->