2025-09-19 文件上传功能优化：增加"关联工序"字段

src/main/java/com/gaotao/modules/pms/controller/QcController.java

@@ -6,6 +6,7 @@ import com.gaotao.modules.base.data.BuData;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.pms.data.*;
 import com.gaotao.modules.pms.entity.PartDefectTrackingEntity;
+import com.gaotao.modules.pms.entity.StandardOperationEntity;
 import com.gaotao.modules.pms.entity.vo.CheckSubDetailValueVo;
 import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo;
 import com.gaotao.modules.pms.entity.vo.PartInformationVo;
@@ -1655,6 +1656,15 @@ public class QcController {
         return R.ok().put("page", page);
     }
 
+    /**
+     * 获取标准工序
+     **/
+    @PostMapping("/getStandardOperation")
+    public R getStandardOperation(@RequestBody StandardOperationEntity data){
+        List<StandardOperationEntity> list = qcBaseInfoService.getStandardOperation(data);
+        return R.ok().put("rows", list);
+    }
+
 }
 
 

src/main/java/com/gaotao/modules/pms/entity/StandardOperationEntity.java

@@ -0,0 +1,10 @@
+package com.gaotao.modules.pms.entity;
+
+import lombok.Data;
+
+@Data
+public class StandardOperationEntity {
+    private Integer id;
+    private String site;
+    private String operationDesc;
+}

src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java

@@ -1,6 +1,7 @@
 package com.gaotao.modules.pms.mapper;
 
 import com.gaotao.modules.pms.entity.PartDefectTrackingEntity;
+import com.gaotao.modules.pms.entity.StandardOperationEntity;
 import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo;
 import com.gaotao.modules.pms.entity.vo.PartInformationVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -238,4 +239,6 @@ public interface QcBaseInfoMapper {
     List<QcTemplateData> getPA2(QcTemplateData partData);
 
     List<QcTemplateData> getPA3(QcTemplateData partData);
+
+    List<StandardOperationEntity> getStandardOperation(StandardOperationEntity data);
 }

src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.base.data.BuData;
 import com.gaotao.modules.pms.data.*;
 import com.gaotao.modules.pms.entity.PartDefectTrackingEntity;
+import com.gaotao.modules.pms.entity.StandardOperationEntity;
 import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo;
 import com.gaotao.modules.pms.entity.vo.PartInformationVo;
 import com.gaotao.modules.pms.entity.vo.PartLabelTemplateVo;
@@ -25,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -1330,4 +1332,11 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService {
         List<QcPartAttributeData> list = qcBaseInfoMapper.getCustomerList(data);
         return list;
     }
+
+    @Override
+    public List<StandardOperationEntity> getStandardOperation(StandardOperationEntity data) {
+        List<StandardOperationEntity> list = qcBaseInfoMapper.getStandardOperation(data);
+        return list;
+    }
+
 }

src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java

@@ -4,6 +4,7 @@ import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.base.data.BuData;
 import com.gaotao.modules.pms.data.*;
 import com.gaotao.modules.pms.entity.PartDefectTrackingEntity;
+import com.gaotao.modules.pms.entity.StandardOperationEntity;
 import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo;
 import com.gaotao.modules.pms.entity.vo.PartInformationVo;
 import com.gaotao.modules.pms.entity.vo.PartLabelTemplateVo;
@@ -146,4 +147,6 @@ public interface QcBaseInfoService {
     void updateLabelTemplate(PartLabelTemplateVo data);
 
     List<QcPartAttributeData> getCustomerList(QcPartAttributeData data);
+
+    List<StandardOperationEntity> getStandardOperation(StandardOperationEntity data);
 }

src/main/resources/mapper/pms/QcBaseInfoMapper.xml

@@ -1689,4 +1689,12 @@
         WHERE site = #{site} and bu_no = #{buNo} and attribute_no = #{attributeNo} and attribute_type = #{attributeType} and template_id = #{templateId} and customer_id = #{customerID}
     </select>
 
+    <select id="getStandardOperation" resultType="com.gaotao.modules.pms.entity.StandardOperationEntity">
+        select
+            id,
+            site,
+            operation_desc
+        from standard_operation
+        where site = #{site}
+    </select>
 </mapper>

src/main/resources/mapper/pms/QcMapper.xml

@@ -3130,7 +3130,8 @@
             ps.phase_out_date as phaseOutDate,
             ps.created_by as createdBy,
             ps.creation_date as creationDate,
-            ps.sop_type as sopType
+            ps.sop_type as sopType,
+            ps.operation_desc as operationDesc
         FROM part_sop ps
         <where>
             <if test="params.site != null and params.site != ''">
@@ -3195,7 +3196,8 @@
             phase_in_date,
             phase_out_date,
             created_by,
-            creation_date
+            creation_date,
+        operation_desc
         ) VALUES (
             #{data.site},
             #{data.buNo},
@@ -3230,7 +3232,8 @@
                 <otherwise>
                     GETDATE()
                 </otherwise>
-            </choose>
+            </choose>,
+        #{data.operationDesc}
         )
     </insert>