Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckProjectController.java

@@ -77,8 +77,7 @@ public class QcCheckProjectController extends BaseController {
         ExcelUtil<QcCheckProject> util = new ExcelUtil<QcCheckProject>(QcCheckProject.class);
         List<QcCheckProject> projectList = util.importExcel(file.getInputStream());
         String operName = SecurityUtils.getUsername();
-        String message = qcCheckProjectService.importCheckProject(projectList, updateSupport, operName);
-        return success(message);
+        return qcCheckProjectService.importCheckProject(projectList, updateSupport, operName);
     }
 
     /**

op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java

@@ -44,6 +44,12 @@ public class QcMaterialGroupController extends BaseController {
         List<QcMaterialGroup> list = qcMaterialGroupService.selectQcMaterialGroupList(qcMaterialGroup);
         return getDataTable(list);
     }
+    @GetMapping("/getOriginalGroupList")
+    public TableDataInfo getOriginalGroupList(QcMaterialGroup qcMaterialGroup) {
+        List<QcMaterialGroup> list = qcMaterialGroupService.getOriginalGroupList(qcMaterialGroup);
+        return getDataTable(list);
+    }
+
 
     /**
      * 获取物料组树列表

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java

@@ -34,7 +34,7 @@ public class QcCheckProject extends BaseEntity {
     /**
      * 检验规则属性
      */
-    @Excel(name = "检验规则属性")
+    @Excel(name = "检验规则属性", readConverterExp = "0=定性,1=定量")
     private String propertyCode;
 
     /**
@@ -80,6 +80,8 @@ public class QcCheckProject extends BaseEntity {
     private String defectLevel;
     @Excel(name = "检验方案类型")
     private String projectType;
+    @Excel(name = "排序")
+    private Integer sort;
     private String materialCode;
     private String typeCode;
     private String groupId;
@@ -243,6 +245,14 @@ public class QcCheckProject extends BaseEntity {
         this.serialNumber = serialNumber;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-quality/src/main/java/com/op/quality/domain/QcMaterialGroup.java

@@ -28,6 +28,11 @@ public class QcMaterialGroup extends BaseEntity {
      */
     @Excel(name = "物料组名称")
     private String groupName;
+    /**
+     * 物料组编码
+     */
+    @Excel(name = "物料组名称")
+    private String groupCode;
 
     /**
      * 预留字段1
@@ -116,6 +121,14 @@ public class QcMaterialGroup extends BaseEntity {
         this.children = children;
     }
 
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java

@@ -29,6 +29,8 @@ public interface QcMaterialGroupMapper {
      */
     public List<QcMaterialGroup> selectQcMaterialGroupList(QcMaterialGroup qcMaterialGroup);
 
+    public List<QcMaterialGroup> getOriginalGroupList(QcMaterialGroup qcMaterialGroup);
+
     /**
      * 新增物料组
      *

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckProjectService.java

@@ -2,6 +2,7 @@ package com.op.quality.service;
 
 import java.util.List;
 
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.quality.domain.QcCheckProject;
 
 /**
@@ -64,5 +65,5 @@ public interface IQcCheckProjectService {
      *
      * @return 结果
      */
-    public String importCheckProject(List<QcCheckProject> projectList, Boolean isUpdateSupport, String operName);
+    public AjaxResult importCheckProject(List<QcCheckProject> projectList, Boolean isUpdateSupport, String operName);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupService.java

@@ -22,6 +22,13 @@ public interface IQcMaterialGroupService {
      */
     public QcMaterialGroup selectQcMaterialGroupById(String id);
 
+    /**
+     * 获得原始物料分组
+     * @param qcMaterialGroup
+     * @return
+     */
+    public List<QcMaterialGroup> getOriginalGroupList(QcMaterialGroup qcMaterialGroup);
+
     /**
      * 查询物料组列表
      *

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.op.quality.service.impl;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.exception.ServiceException;
@@ -8,7 +9,10 @@ import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.bean.BeanValidators;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.security.utils.SecurityUtils;
+import com.op.quality.domain.QcProjectType;
+import com.op.quality.mapper.QcProjectTypeMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +28,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Validator;
 
+import static com.op.common.core.web.domain.AjaxResult.error;
+import static com.op.common.core.web.domain.AjaxResult.success;
+
 /**
  * 检验项目维护Service业务层处理
  *
@@ -40,6 +47,9 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
     @Autowired
     protected Validator validator;
 
+    @Autowired
+    private QcProjectTypeMapper qcProjectTypeMapper;
+
     /**
      * 查询检验项目维护
      *
@@ -127,7 +137,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
 
     @Override
     @DS("#header.poolName")
-    public String importCheckProject(List<QcCheckProject> projectList, Boolean isUpdateSupport, String operName) {
+    public AjaxResult importCheckProject(List<QcCheckProject> projectList, Boolean isUpdateSupport, String operName) {
         if (CollectionUtils.isEmpty(projectList)) {
             throw new ServiceException("导入的检测项目数据为空！");
         }
@@ -139,6 +149,9 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String key = "#header.poolName";
         String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
+        //校验数据
+        AjaxResult checkResult = checkImportProject(projectList);
+        if (checkResult.isSuccess()) {
             for (QcCheckProject project : projectList) {
                 try {
                     QcCheckProject pro = qcCheckProjectMapper.selectCheckProjectByRuleName(project.getRuleName(), project.getProjectType());
@@ -176,7 +189,9 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
             } else {
                 successMsg.insert(0, "恭喜您，数据已全部导入成功！ 共" + successNum + " 条，数据如下：");
             }
-        return successMsg.toString();
+            return success(successMsg.toString());
+        }
+        return checkResult;
     }
 
     private String getOrderNum() {
@@ -187,4 +202,53 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
         orderNum = now + "0" + checkProject.getSerialNumber();
         return orderNum;
     }
+
+    public AjaxResult checkImportProject(List<QcCheckProject> qcCheckProjectList) {
+        if (CollectionUtils.isEmpty(qcCheckProjectList)) {
+            return error(500,"导入的订单信息不能为空！信息导入失败");
+        }
+        for (QcCheckProject project : qcCheckProjectList) {
+            if (StringUtils.isEmpty(project.getOrderNum())) {
+                return error(500,"检验规则编号不能为空，信息导入失败，请检查是否存在空数据项");
+            }
+            if (StringUtils.isEmpty(project.getRuleName())) {
+                return error(500,"检验规则名称不能为空，信息导入失败");
+            }
+            if (StringUtils.isEmpty(project.getPropertyCode())) {
+                return error(500,"检验规则属性不能为空，信息导入失败");
+            }
+            if (StringUtils.isEmpty(project.getProjectType())) {
+                return error(500,"检验方案类型不能为空，信息导入失败");
+            }else {
+                boolean flag = typeConverter(project);
+                if (!flag) {
+                    String ruleName = project.getRuleName();
+                    return error(500,"检验规则名称:"+ ruleName +"检验方案类型不规范，信息导入失败");
+                }
+            }
+            if (project.getSort() == null) {
+                return error(500,"排序不能为空，信息导入失败");
+            }
+        }
+        return success();
+    }
+
+    /**
+     * 方案类型转换
+     */
+    public boolean typeConverter(QcCheckProject project) {
+        String projectType = project.getProjectType();
+        List<QcProjectType> projectTypes = qcProjectTypeMapper.selectQcProjectTypeList(new QcProjectType());
+        //筛选出检验方案类型名称相同的项目
+        Optional<QcProjectType> matchedType = projectTypes.stream()
+                .filter(item -> projectType.equals(item.getProjectTypeName()))
+                .findFirst();
+        //使用code替换名称
+        if (matchedType.isPresent()) {
+            project.setProjectType(matchedType.get().getProjectTypeCode());
+            return true;
+        }else {
+            return false;
+        }
+    }
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java

@@ -48,10 +48,22 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService {
      * @return 物料组
      */
     @Override
+    @DS("#header.poolName")
     public QcMaterialGroup selectQcMaterialGroupById(String id) {
         return qcMaterialGroupMapper.selectQcMaterialGroupById(id);
     }
 
+    /**
+     * 获取原始物料分组
+     * @param qcMaterialGroup
+     * @return
+     */
+    @Override
+    @DS("#header.poolName")
+    public List<QcMaterialGroup> getOriginalGroupList(QcMaterialGroup qcMaterialGroup) {
+        return qcMaterialGroupMapper.getOriginalGroupList(qcMaterialGroup);
+    }
+
     @Override
     //@DataScope(deptAlias = "d")
     @DS("#header.poolName")

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml

@@ -24,13 +24,13 @@
         <result property="judge" column="judge"/>
         <result property="defectLevel" column="defect_level"/>
         <result property="projectType" column="project_type"/>
-
+        <result property="sort" column="sort" />
     </resultMap>
 
     <sql id="selectQcCheckProjectVo">
 		select id, order_num, rule_name, property_code, check_mode, check_tool, unit_code, check_standard,
 		       attr1, create_by, create_time, update_by, update_time, factory_code, del_flag,sample_plan,
-			   judge,defect_level,project_type
+			   judge,defect_level,project_type,sort
 		from qc_check_project
 	</sql>
 
@@ -48,6 +48,7 @@
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
             <if test="judge != null  and judge != ''">and judge = #{judge}</if>
             <if test="projectType != null and projectType != ''">project_type = #{projectType}</if>
+            and del_flag = '0'
         </where>
         order by create_time
     </select>
@@ -79,7 +80,7 @@
             <if test="judge != null">judge,</if>
             <if test="defectLevel != null">defect_level,</if>
             <if test="projectType != null">project_type,</if>
-
+            <if test="sort != null">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -101,6 +102,7 @@
             <if test="judge != null">#{judge},</if>
             <if test="defectLevel != null">#{defectLevel},</if>
             <if test="projectType != null">#{projectType},</if>
+            <if test="sort != null">#{sort},</if>
         </trim>
     </insert>
 
@@ -125,16 +127,17 @@
             <if test="judge != null">judge = #{judge},</if>
             <if test="defectLevel != null">defect_level = #{defectLevel},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="sort != null">sort = #{sort},</if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteQcCheckProjectById" parameterType="String">
-		delete from qc_check_project where id = #{id}
+		update qc_check_project set del_flag = '1' where id = #{id}
 	</delete>
 
     <delete id="deleteQcCheckProjectByIds" parameterType="String">
-        delete from qc_check_project where id in
+        update qc_check_project set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml

@@ -125,7 +125,7 @@
         qcp.check_mode checkMode
         <!--,qcp.check_standard checkStandard-->
         from qc_check_type_project qctp
-        left join qc_check_project qcp on qcp.id = qctp.project_id
+        left join qc_check_project qcp on qcp.id = qctp.project_id and qcp.del_flag = '0'
         where qctp.del_flag = '0' and qctp.status = '1'
         and qctp.material_code = #{materialCode}
         and qctp.type_id = #{typeId}
@@ -284,11 +284,11 @@
     </update>
 
     <delete id="deleteQcCheckTypeProjectById" parameterType="String">
-		delete from qc_check_type_project where id = #{id}
+		update qc_check_type_project set del_flag = '1' where id = #{id}
 	</delete>
 
     <delete id="deleteQcCheckTypeProjectByIds" parameterType="String">
-        delete from qc_check_type_project where id in
+        update qc_check_type_project set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -304,6 +304,7 @@
         unit_code unitCode,
         check_standard checkStandard,
         sample_plan samplePlan,
+        sort,
         judge ,
         defect_level defectLevel
         from qc_check_project
@@ -312,7 +313,7 @@
         <if test="ruleName != null">and rule_name like concat('%',#{ruleName},'%')</if>
         and id not in(
         select project_id from qc_check_type_project
-        where type_id = #{typeCode}
+        where del_flag = '0' and type_id = #{typeCode}
         <if test="samplePlan != null">and sample_plan = #{samplePlan}</if>
         <if test="materialCode != null">and material_code = #{materialCode}</if>
         )

op-modules/op-quality/src/main/resources/mapper/quality/QcGoalDistributeMapper.xml

@@ -22,7 +22,21 @@
     </resultMap>
 
     <sql id="selectQcGoalDistributeVo">
-		select id, belong_goal_id, supplier_code, supplier_name, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_goal_distribute
+        select id,
+               belong_goal_id,
+               supplier_code,
+               supplier_name,
+               attr1,
+               attr2,
+               attr3,
+               attr4,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               factory_code,
+               del_flag
+        from qc_goal_distribute
     </sql>
 
     <select id="selectQcGoalDistributeList" parameterType="QcGoalDistribute" resultMap="QcGoalDistributeResult">
@@ -52,13 +66,14 @@
             <if test="factoryCode != null  and factoryCode != ''">
                 and factory_code = #{factoryCode}
             </if>
+            and del_flag = '0'
         </where>
     </select>
 
     <select id="selectQcGoalDistributeById" parameterType="String"
             resultMap="QcGoalDistributeResult">
         <include refid="selectQcGoalDistributeVo"/>
-            where id = #{id}
+        where del_flag = '0' and id = #{id}
     </select>
 
     <insert id="insertQcGoalDistribute" parameterType="QcGoalDistribute">
@@ -172,11 +187,11 @@
     </update>
 
     <delete id="deleteQcGoalDistributeById" parameterType="String">
-		delete from qc_goal_distribute where id = #{id}
+        update qc_goal_distribute set del_flag = '1' where id = #{id}
     </delete>
 
     <delete id="deleteQcGoalDistributeByIds" parameterType="String">
-        delete from qc_goal_distribute where id in
+        update qc_goal_distribute set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -228,7 +243,8 @@
         FROM qc_goal_distribute gd
         WHERE gd.belong_goal_id =#{ belongGoalId }
         )
-        <if test="supplierName != null and supplierName != ''">and bp.product_desc_zh like concat('%', #{supplierName},'%')
+        <if test="supplierName != null and supplierName != ''">and bp.product_desc_zh like concat('%',
+            #{supplierName},'%')
         </if>
     </select>
 

op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml

@@ -60,6 +60,7 @@
             <if test="parentGoal != null  and parentGoal != ''">
                 and parent_goal = #{parentGoal}
             </if>
+            and del_flag = '0'
         </where>
         order by id desc
     </select>
@@ -94,6 +95,7 @@
             <if test="parentGoal != null  and parentGoal != ''">
                 and parent_goal = #{parentGoal}
             </if>
+            and del_flag = '0'
         </where>
         order by id asc
     </select>
@@ -101,7 +103,7 @@
     <select id="selectQcGoalById" parameterType="String"
             resultMap="QcGoalResult">
             <include refid="selectQcGoalVo"/>
-            where id = #{id}
+            where del_flag= = '0' id = #{id}
     </select>
 
     <insert id="insertQcGoal" parameterType="QcGoal">
@@ -249,11 +251,11 @@
     </select>
 
     <delete id="deleteQcGoalById" parameterType="String">
-		delete from qc_goal where id = #{id}
+		update qc_goal set del_flag = '1' where id = #{id}
 	</delete>
 
     <delete id="deleteQcGoalByIds" parameterType="String">
-        delete from qc_goal where id in
+        update qc_goal set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml

@@ -33,6 +33,7 @@
             </if>
             <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            and del_flag = '0'
         </where>
     </select>
 
@@ -96,11 +97,11 @@
     </update>
 
     <delete id="deleteQcMaterialGroupDetailById" parameterType="String">
-		delete from qc_material_group_detail where id = #{id}
+		update qc_material_group_detail set del_flag = '1' where id = #{id}
 	</delete>
 
     <delete id="deleteQcMaterialGroupDetailByIds" parameterType="String">
-        delete from qc_material_group_detail where id in
+        update qc_material_group_detail set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml

@@ -26,6 +26,7 @@
             <if test="groupName != null  and groupName != ''">and group_name like concat('%', #{groupName}, '%')</if>
             <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            and del_flag = '0'
         </where>
         /*select
         mg.id,
@@ -37,6 +38,14 @@
         WHERE mg.del_flag = '0'*/
     </select>
 
+    <select id="getOriginalGroupList" parameterType="QcMaterialGroup" resultType="QcMaterialGroup">
+        SELECT DISTINCT
+            product_group groupCode,
+            concat(product_group_name,'(',product_group,')') groupName
+        FROM base_product
+        WHERE del_flag = '0'
+    </select>
+
     <select id="getMaterialChildrenList" parameterType="QcMaterialGroup" resultMap="QcMaterialGroupResult">
         select
         id,
@@ -61,6 +70,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="groupName != null">group_name,</if>
+            <if test="groupCode != null">group_code,</if>
             <if test="attr1 != null">attr1,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -72,6 +82,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="groupName != null">#{groupName},</if>
+            <if test="groupCode != null">#{groupCode},</if>
             <if test="attr1 != null">#{attr1},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -86,6 +97,7 @@
         update qc_material_group
         <trim prefix="SET" suffixOverrides=",">
             <if test="groupName != null">group_name = #{groupName},</if>
+            <if test="groupCode != null">group_code = #{groupCode},</if>
             <if test="attr1 != null">attr1 = #{attr1},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -98,11 +110,11 @@
     </update>
 
     <delete id="deleteQcMaterialGroupById" parameterType="String">
-		delete from qc_material_group where id = #{id}
+		update qc_material_group set del_flag = '1' where id = #{id}
 	</delete>
 
     <delete id="deleteQcMaterialGroupByIds" parameterType="String">
-        delete from qc_material_group where id in
+        update qc_material_group set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml

@@ -36,6 +36,7 @@
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
             <if test="standardNo != null and standardNo != ''">and standard_no = #{standardNo}</if>
             <if test="version != null and version != ''">and version = #{version}</if>
+            and del_flag = '0'
         </where>
     </select>
 

op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleMapper.xml

@@ -34,6 +34,7 @@
             <if test="sampleQuality != null ">and sample_quality = #{sampleQuality}</if>
             <if test="checkType != null  and checkType != ''">and check_type = #{checkType}</if>
             <if test="typeCode != null  and typeCode != ''">and type_code = #{typeCode}</if>
+            and del_flag = '0'
         </where>
     </select>
 
@@ -102,11 +103,11 @@
     </update>
 
     <delete id="deleteQcSampleRuleById" parameterType="String">
-		delete from qc_sample_rule where id = #{id}
+		update qc_sample_rule set del_flag = '1' where id = #{id}
 	</delete>
 
     <delete id="deleteQcSampleRuleByIds" parameterType="String">
-        delete from qc_sample_rule where id in
+        update qc_sample_rule set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>