Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/project/data/PlmProjectPartData.java

@@ -24,6 +24,11 @@ public class PlmProjectPartData extends PlmProjectPart {
      **/
     private String customerDesc;
 
+    private  String groupName;
+
+    private String productGroupName1;
+    private String productGroupName2;
+
     public String getProjectName() {
         return projectName;
     }
@@ -71,4 +76,28 @@ public class PlmProjectPartData extends PlmProjectPart {
     public void setCodeDesc(String codeDesc) {
         this.codeDesc = codeDesc;
     }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getProductGroupName1() {
+        return productGroupName1;
+    }
+
+    public void setProductGroupName1(String productGroupName1) {
+        this.productGroupName1 = productGroupName1;
+    }
+
+    public String getProductGroupName2() {
+        return productGroupName2;
+    }
+
+    public void setProductGroupName2(String productGroupName2) {
+        this.productGroupName2 = productGroupName2;
+    }
 }

src/main/java/com/spring/modules/project/entity/PlmProjectPart.java

@@ -73,6 +73,11 @@ public class PlmProjectPart {
     private String codeNo;
     private String finialPartNo;
 
+    private String groupId;
+
+    private String productGroupId1;
+    private String productGroupId2;
+
     public Integer getId() {
         return id;
     }
@@ -200,5 +205,29 @@ public class PlmProjectPart {
     public void setFinialPartNo(String finialPartNo) {
         this.finialPartNo = finialPartNo;
     }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getProductGroupId1() {
+        return productGroupId1;
+    }
+
+    public void setProductGroupId1(String productGroupId1) {
+        this.productGroupId1 = productGroupId1;
+    }
+
+    public String getProductGroupId2() {
+        return productGroupId2;
+    }
+
+    public void setProductGroupId2(String productGroupId2) {
+        this.productGroupId2 = productGroupId2;
+    }
 }
 

src/main/java/com/spring/modules/sys/controller/DictDataController.java

@@ -75,6 +75,24 @@ public class DictDataController {
         }
         return R.error("操作失败");
     }
+    /**
+     * 修改字典数据状态为停用
+     * @param dictDataList
+     * author           zelian_wu
+     * date             2024-1-3
+     * @return
+     */
+    @PostMapping("/removeBatch")
+    public R removeBatchDictData(@RequestBody List<DictData> dictDataList){
+        if (Objects.isNull(dictDataList)|| dictDataList.isEmpty()){
+            throw new RuntimeException("请选择字典数据");
+        }
+        if (dictDataService.lambdaUpdate().set(DictData::getStatus,"N")
+                .in(DictData::getDictCode,dictDataList.stream().map(DictData::getDictCode).collect(Collectors.toList())).update()) {
+            return R.ok("操作成功!");
+        }
+        return R.error("操作失败");
+    }
     /**
      * 删除字典数据
      * @param dictData

src/main/resources/mapper/project/ProjectDao.xml

@@ -22,7 +22,7 @@
                 AND project_id like #{query.projectId}
             </if>
             <if test="query.projectType != null and query.projectType != ''">
-                AND dbo.plm_get_projectBaseDesc(project_type_db,'project_type') like #{query.projectType}
+                AND plm_project_info.project_type_db like #{query.projectType}
             </if>
             <if test="query.projectOwnerName != null and query.projectOwnerName != ''">
                 AND dbo.get_projectTeamName(site,project_id,'ProjectOwner') like '%' + #{query.projectOwnerName} +'%'
@@ -142,14 +142,60 @@
     delete from plm_project_part where  site=#{site} and project_id=#{projectId}
 </delete>
 <select id="getProjectInfoPartList" resultType="PlmProjectPartData">
-    select id,site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,remark,create_date,create_by,update_date,part_name,
-update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc,final_part_no,code_no,dbo.get_code_desc(site,code_no,'A') codeDesc
+    select
+    id,
+    site,
+    project_id,
+    test_part_no,
+    part_type,
+    part_desc,
+    part_spec,
+    material_number,
+    remark,
+    create_date,
+    create_by,
+    update_date,
+    part_name,
+    update_by,
+    dbo.get_family_name(site, part_type) as partTypeDesc,
+    final_part_no,
+    code_no,
+    dbo.get_code_desc(site, code_no, 'B') as codeDesc,
+    group_id,
+    dbo.get_group_name(site, group_id) as groupName,
+    product_group_id1,
+    dbo.get_product_group_name(site, product_group_id1, '1') as productGroupName1,
+    product_group_id2,
+    dbo.get_product_group_name(site, product_group_id2, '2') as productGroupName2
     from plm_project_part where site=#{site} and project_id=#{projectId}
 </select>
 
 <select id="checkProjectInfoPartList" resultType="PlmProjectPartData">
-    select top 1 id,site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,remark,create_date,create_by,update_date,part_name,
-update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc,final_part_no,code_no,dbo.get_code_desc(site,code_no,'A') codeDesc
+    select top 1
+    id,
+    site,
+    project_id,
+    test_part_no,
+    part_type,
+    part_desc,
+    part_spec,
+    material_number,
+    remark,
+    create_date,
+    create_by,
+    update_date,
+    part_name,
+    update_by,
+    dbo.get_family_name(site, part_type) as partTypeDesc,
+    final_part_no,
+    code_no,
+    dbo.get_code_desc(site, code_no, 'B') as codeDesc,
+    group_id,
+    dbo.get_group_name(site, group_id) as groupName,
+    product_group_id1,
+    dbo.get_product_group_name(site, product_group_id1, '1') as productGroupName1,
+    product_group_id2,
+    dbo.get_product_group_name(site, product_group_id2, '2') as productGroupName2
     from plm_project_part where site=#{site} and test_part_no=#{testPartNo}
 </select>
 <select id="getTestPartNo" resultType="String">
@@ -157,12 +203,53 @@ update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc,final_
     where site=#{site} and project_id=#{projectId}
 </select>
 <insert id="saveProjectPart">
-    insert into plm_project_part(site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,remark,create_date,create_by,part_name,code_no) values
-    (#{site},#{projectId},#{testPartNo},#{partType},#{partDesc},#{partSpec},#{materialNumber},#{remark},GetDate(),#{username},#{partName},#{codeNo})
+    insert into plm_project_part
+    (site,project_id,
+    test_part_no,
+    part_type,
+    part_desc,
+    part_spec,
+    material_number,
+    remark,
+    create_date,
+    create_by,
+    part_name,
+    code_no,
+    group_id,
+    product_group_id1,
+    product_group_id2)
+    values
+    (#{site},
+    #{projectId},
+    #{testPartNo},
+    #{partType},
+    #{partDesc},
+    #{partSpec},
+    #{materialNumber},
+    #{remark},
+    GetDate(),
+    #{username},
+    #{partName},
+    #{codeNo},
+    #{groupId},
+    #{productGroupId1},
+    #{productGroupId2})
 </insert>
 <update id="updateProjectPart">
-    update plm_project_part set part_type=#{partType},part_desc=#{partDesc},part_spec=#{partSpec},material_number=#{materialNumber},
-    remark=#{remark},update_date=GetDate(),update_by=#{username},part_name=#{partName},code_no=#{codeNo} where id=#{id}
+    update plm_project_part
+    set part_type=#{partType},
+    part_desc=#{partDesc},
+    part_spec=#{partSpec},
+    material_number=#{materialNumber},
+    remark=#{remark},
+    update_date=GetDate(),
+    update_by=#{username},
+    part_name=#{partName},
+    code_no=#{codeNo},
+    group_id = #{groupId},
+    product_group_id1 = #{productGroupId1},
+    product_group_id2 = #{productGroupId2}
+    where id=#{id}
 </update>
 
 <delete id="deleteProjectPartWithId">
@@ -196,9 +283,32 @@ update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc,final_
 </select>
 
 <select id="getProjectPartList" resultType="com.spring.modules.project.data.PlmProjectPartData">
-    select site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,part_name,
-           dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc
-    from dbo.plm_project_part where site=#{site}
+    select
+    id,
+    site,
+    project_id,
+    test_part_no,
+    part_type,
+    part_desc,
+    part_spec,
+    material_number,
+    remark,
+    create_date,
+    create_by,
+    update_date,
+    part_name,
+    update_by,
+    dbo.get_family_name(site, part_type) as partTypeDesc,
+    final_part_no,
+    code_no,
+    dbo.get_code_desc(site, code_no, 'B') as codeDesc,
+    group_id,
+    dbo.get_group_name(site, group_id) as groupName,
+    product_group_id1,
+    dbo.get_product_group_name(site, product_group_id1, '1') as productGroupName1,
+    product_group_id2,
+    dbo.get_product_group_name(site, product_group_id2, '2') as productGroupName2
+    from plm_project_part where site=#{site}
     <if test="testPartNo != null and testPartNo != ''">
         and test_part_no like #{testPartNo}
     </if>
@@ -207,9 +317,32 @@ update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc,final_
     </if>
 </select>
     <select id="getProjectPart" resultType="com.spring.modules.project.data.PlmProjectPartData">
-        select site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,part_name,
-               dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc
-        from dbo.plm_project_part where site=#{site}
+        select
+        id,
+        site,
+        project_id,
+        test_part_no,
+        part_type,
+        part_desc,
+        part_spec,
+        material_number,
+        remark,
+        create_date,
+        create_by,
+        update_date,
+        part_name,
+        update_by,
+        dbo.get_family_name(site, part_type) as partTypeDesc,
+        final_part_no,
+        code_no,
+        dbo.get_code_desc(site, code_no, 'B') as codeDesc,
+        group_id,
+        dbo.get_group_name(site, group_id) as groupName,
+        product_group_id1,
+        dbo.get_product_group_name(site, product_group_id1, '1') as productGroupName1,
+        product_group_id2,
+        dbo.get_product_group_name(site, product_group_id2, '2') as productGroupName2
+        from plm_project_part where site=#{site}
         <if test="testPartNo != null and testPartNo != ''">
             and test_part_no = #{testPartNo}
         </if>

src/main/resources/mapper/quotation/QuotationInformationMapper.xml

@@ -172,7 +172,6 @@
         SELECT
             project_id,
             ori_project_id,
-            project_level,
             project_type_db,
             project_name,
             status,
@@ -190,11 +189,11 @@
             remark,
             dbo.get_projectTeamName(site, project_id, 'owner') projectOwnerName,
             dbo.get_projectTeamName(site, project_id, 'manager') ProjectManagerName,
-            dbo.plm_get_projectBaseDesc(project_type_db,'project_type') projectType,
+            dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
             dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,
-            dbo.plm_get_projectBaseDesc(project_source,'project_source') projectSourceDesc,
+            dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
             dbo.plm_get_customer_desc(site,customer_id) customerName,
-            dbo.plm_get_projectBaseDesc(priority,'project_priority') priorityDesc,
+            dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,
             need_date,
             dbo.get_projectUserRoleName(site,project_id) userRoleName
         FROM plm_project_info