生产检验，电子文档

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -96,4 +97,7 @@ public class InspectionTemplate extends BaseEntity {
 	 */
 	@Schema(description = "工序数")
     private Integer processNum;
+
+    @TableField(exist = false)
+    private String updateUserName;
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java

@@ -71,4 +71,9 @@ public class QualityGradeEntity extends BaseEntity {
 	private String types;
 
 
+	@Schema(description = "是否局部镀 0-否 1-是")
+	private String isLocal;
+	@Schema(description = "是否厚金区固定厚度 0-否 1-是")
+	private String isThickness;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -136,15 +136,15 @@
     </select>
 
     <select id="findCubByYoIdMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
-        select * from MES_WORK_ORDER a left join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.FATHER_YO_ID = #{yoId}
+        select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.FATHER_YO_ID = #{yoId}
     </select>
 
     <select id="listByWpIdMes" resultType="org.springblade.desk.quality.pojo.entity.WorkPlanItem">
-        select * from QA_WORK_PLAN_ITEM a left join MES_WORK_PLAN b on a.wp_id = b.ID where a.wp_id= #{wpId}
+        select * from QA_WORK_PLAN_ITEM a inner join MES_WORK_PLAN b on a.wp_id = b.ID where a.wp_id= #{wpId}
     </select>
 
     <select id="listByPartCodeNew" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity">
-        select * from DS_PART_RELATION a left join DS_PART b on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and b.SIN_TER_TYPE = #{indexNum}
+        select * from DS_PART_RELATION a inner join DS_PART b on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and b.SIN_TER_TYPE = #{indexNum}
     </select>
 
     <select id="getByPartCodeAndSubCodeMes" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartSub">
@@ -153,7 +153,7 @@
     </select>
 
     <select id="findByPartCodeAndMemoMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
-        select * from MES_WORK_ORDER a left join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.PART_CODE= #{partCode} and b.YP_CODE = #{memo}
+        select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.PART_CODE= #{partCode} and b.YP_CODE = #{memo}
     </select>
 
     <select id="getCheckManByNewErpMes" resultType="String">
@@ -229,7 +229,8 @@
     </select>
 
     <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">
-        select * from MES_RB_FILE_PRESERVE_DETAIL a left  join MES_RB_FILE_PRESERVE_SLOT  b on a.rfps_id = b.id and a.rfps_id = #{id}
+        select * from MES_RB_FILE_PRESERVE_DETAIL a inner  join MES_RB_FILE_PRESERVE_SLOT  b
+            on a.rfps_id = b.id and a.rfps_id = #{id} and a.is_delete = 0
     </select>
 
     <select id="listByWoIdAllMes" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
@@ -252,13 +253,13 @@
 
     <select id="getDataByWpIdAndIndexListNew" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select a.* from MES_MAC_TOOL_USE a
-                            left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
+                            inner join MES_WORK_PLAN wp on a.WP_ID = wp.ID
         where a.WP_ID=#{wpId}
     </select>
 
     <select id="getDataByWpIdAndIndex" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select a.* from MES_MAC_TOOL_USE a
-                            left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
+                            inner join MES_WORK_PLAN wp on a.WP_ID = wp.ID
         where wp.Id=#{wpId} and a.mtu_index=#{numberIndex} order by a.Id desc
     </select>
 
@@ -285,7 +286,7 @@
 
     <select id="getByRfpsId" resultType="org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO">
        select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
-       left join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
+       inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
        where slot.rfp_id =#{rfpsId}
 
     </select>
@@ -294,7 +295,7 @@
     <select id="getByRfpId" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity">
         select a.*  from MES_RB_FILE_PRESERVE_SLOT slot
 --         left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
-        left join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
+        inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
         where slot.RFP_ID =#{rfpId}
 
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@@ -296,6 +296,7 @@ public class InspectionTaskController extends BladeController {
         List<MesRbFilePreserveSlotEntity> preserveSlotList = new ArrayList<>();
         QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("RFP_ID", rfpId);
+        queryWrapper.orderByDesc("create_time");
         preserveSlotList = mesRbFilePreserveSlotService.list(queryWrapper);
 
 //        QueryWrapper<WorkPlan> queryWrapper = new QueryWrapper<>();

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java

@@ -96,11 +96,15 @@ public class InspectionTemplateController extends BladeController {
 
 //        QueryWrapper<InspectionTemplate> qw = Condition.getQueryWrapper(map, InspectionTemplate.class);
         InspectionTemplateSearch search = new InspectionTemplateSearch();
-        if (map.containsKey(InspectionTemplate.COL_INSPECTION_TEMPLATE_CODE)) {
-            search.setInspectionTemplateCode((String) map.get(InspectionTemplate.COL_INSPECTION_TEMPLATE_CODE));
+        if (map.containsKey("inspectionTemplateCode")) {
+//            search.setInspectionTemplateCode((String) map.get(InspectionTemplate.COL_INSPECTION_TEMPLATE_CODE));
+            search.setInspectionTemplateCode((String) map.get("inspectionTemplateCode"));
+
         }
-        if (map.containsKey(InspectionTemplate.COL_NAME)) {
-            search.setName((String) map.get(InspectionTemplate.COL_NAME));
+        if (map.containsKey("name")) {
+//            search.setName((String) map.get(InspectionTemplate.COL_NAME));
+            search.setName((String) map.get("name"));
+
         }
         if (map.containsKey("processNum")) {
             search.setProcessNum(Integer.parseInt((String) map.get("processNum")));

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.xml

@@ -14,6 +14,7 @@
         <result column="REMARK" property="remark"/>
         <result column="CATEGORY" property="category"/>
         <result column="PROCESS_NUM" property="processNum"/>
+        <result column="UPDATE_USER_REAL_NAME" property="updateUserName"/>
     </resultMap>
 
     <select id="selectInspectionTemplatePage" resultMap="inspectionTemplateResultMap">
@@ -29,7 +30,7 @@
     </select>
 
     <select id="listSearch" resultMap="inspectionTemplateResultMap">
-        SELECT t.*
+        SELECT t.*,u.REAL_NAME AS UPDATE_USER_REAL_NAME
         FROM QA_INSPECTION_TEMPLATE t
         LEFT JOIN BLADE_USER u
         ON t.UPDATE_USER = u.ID

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -1742,7 +1742,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 if(StringUtils.isBlank(dsRbFilePreserveSlot.getSlotName())){
                     throw new RuntimeException("请将槽号/工位填写完成");
                 }
-                if (dsRbFilePreserveSlot.getRfpId() != null) {
+                if (dsRbFilePreserveSlot.getId() != null) {
                     mesRbFilePreserveSlotService.updateById(dsRbFilePreserveSlot);
                 } else {
                     mesRbFilePreserveSlotService.save(dsRbFilePreserveSlot);