Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java

src/main/java/com/xujie/sys/modules/pms/data/EquipmentDataAcquisitionData.java

@@ -17,4 +17,7 @@ public class EquipmentDataAcquisitionData {
     private Date createDate;
     private String createBy;
     private Integer batchNo;
+    private String itemNo;
+    private String collectionSource;
+    private String actionBy;
 }

src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@@ -20,6 +20,8 @@ public class QcFAIRecordData extends QueryPage {
     private String ssrId;
     // 状态
     private String state;
+    // 状态
+    private List<String> states;
     // 供应商编码
     private String supplierNo;
     // 供应商名称
@@ -233,6 +235,14 @@ public class QcFAIRecordData extends QueryPage {
 
     private List<SubDetailValues> subDetailList;
 
+    public List<String> getStates() {
+        return states;
+    }
+
+    public void setStates(List<String> states) {
+        this.states = states;
+    }
+
     public List<SubDetailValues> getSubDetailList() {
         return subDetailList;
     }

src/main/java/com/xujie/sys/modules/pms/data/QcItemData.java

@@ -86,6 +86,26 @@ public class QcItemData extends QueryPage {
      */
     private String buDesc;
 
+    private String collectionFlag;
+
+    private String collectionSource;
+
+    public String getCollectionFlag() {
+        return collectionFlag;
+    }
+
+    public void setCollectionFlag(String collectionFlag) {
+        this.collectionFlag = collectionFlag;
+    }
+
+    public String getCollectionSource() {
+        return collectionSource;
+    }
+
+    public void setCollectionSource(String collectionSource) {
+        this.collectionSource = collectionSource;
+    }
+
     public String getBu() {
         return bu;
     }

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -483,7 +483,7 @@ public interface QcMapper {
 
     void actionFQCInspection(QcFAIRecordData data);
 
-    void addEquipmentDataAcquisition(QcFAIRecordData data);
+    void addEquipmentDataAcquisition(List<EquipmentDataAcquisitionData> data);
 
     void saveOperator(List<QcOperatorData> data);
 
@@ -492,4 +492,12 @@ public interface QcMapper {
     List<EquipmentDataAcquisitionData> getInspectionNo(QcFAIRecordData data);
 
     List<SubDetailValues> dataAcquisition(EquipmentDataAcquisitionData equipmentDataAcquisitionData);
+
+    List<EquipmentDataAcquisitionData> getIQCDetail(QcFAIRecordData data);
+
+    List<EquipmentDataAcquisitionData> getFAIDetail(QcFAIRecordData data);
+
+    List<EquipmentDataAcquisitionData> getIPQCDetail(QcFAIRecordData data);
+
+    List<EquipmentDataAcquisitionData> getFQCDetail(QcFAIRecordData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -4651,9 +4651,15 @@ public class QcServiceImpl implements QcService {
     @Override
     @Transactional
     public void actionIQCInspection(QcFAIRecordData data) {
+        // 修改检验单状态为待检验
         qcMapper.actionIQCInspection(data);
+        // 查出该检验单的项目
+        List<EquipmentDataAcquisitionData> list = qcMapper.getIQCDetail(data);
         // 将用户名和检验单号存入Equipment_data_acquisition
-        qcMapper.addEquipmentDataAcquisition(data);
+        if (!list.isEmpty()) {
+            qcMapper.addEquipmentDataAcquisition(list);
+        }
+
     }
 
     /**
@@ -4661,10 +4667,16 @@ public class QcServiceImpl implements QcService {
      * @param data
      */
     @Override
+    @Transactional
     public void actionFAIInspection(QcFAIRecordData data) {
+        // 修改检验单状态为待检验
         qcMapper.actionFAIInspection(data);
+        // 查出该检验单的项目
+        List<EquipmentDataAcquisitionData> list = qcMapper.getFAIDetail(data);
         // 将用户名和检验单号存入Equipment_data_acquisition
-        qcMapper.addEquipmentDataAcquisition(data);
+        if (!list.isEmpty()) {
+            qcMapper.addEquipmentDataAcquisition(list);
+        }
     }
 
     /**
@@ -4672,10 +4684,16 @@ public class QcServiceImpl implements QcService {
      * @param data
      */
     @Override
+    @Transactional
     public void actionIPQCInspection(QcFAIRecordData data) {
+        // 修改检验单状态为待检验
         qcMapper.actionIPQCInspection(data);
+        // 查出该检验单的项目
+        List<EquipmentDataAcquisitionData> list = qcMapper.getIPQCDetail(data);
         // 将用户名和检验单号存入Equipment_data_acquisition
-        qcMapper.addEquipmentDataAcquisition(data);
+        if (!list.isEmpty()) {
+            qcMapper.addEquipmentDataAcquisition(list);
+        }
     }
 
     /**
@@ -4683,10 +4701,16 @@ public class QcServiceImpl implements QcService {
      * @param data
      */
     @Override
+    @Transactional
     public void actionFQCInspection(QcFAIRecordData data) {
+        // 修改检验单状态为待检验
         qcMapper.actionFQCInspection(data);
+        // 查出该检验单的项目
+        List<EquipmentDataAcquisitionData> list = qcMapper.getFQCDetail(data);
         // 将用户名和检验单号存入Equipment_data_acquisition
-        qcMapper.addEquipmentDataAcquisition(data);
+        if (!list.isEmpty()) {
+            qcMapper.addEquipmentDataAcquisition(list);
+        }
     }
 
     /**
@@ -4700,11 +4724,18 @@ public class QcServiceImpl implements QcService {
         if (noList.isEmpty()) {
             throw new RuntimeException("数据采集失败(未获取到检验单信息)!");
         }
-        // 数据采集
-        List<SubDetailValues> subDetailList = qcMapper.dataAcquisition(noList.get(0));
+        List<SubDetailValues> subDetailList = new ArrayList<>();
+        for (EquipmentDataAcquisitionData acquisitionData : noList) {
+            // 数据采集
+            List<SubDetailValues> dataList = qcMapper.dataAcquisition(acquisitionData);
+            subDetailList.addAll(dataList);
+        }
         return subDetailList;
     }
 
+
+
+
     public static File multipartFileToFile(MultipartFile file ,String fileName) throws Exception {
         File toFile = null;
         if (file.equals("") || file.getSize() <= 0) {

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

@@ -111,7 +111,9 @@
             qsip.sampling_programme_desc,
             epi.sampling_level_no,
             qsil.sampling_level_desc,
-            epi.default_sampling_proportion
+            epi.default_sampling_proportion,
+            epi.collection_flag,
+            epi.collection_source
         FROM eam_properties_item as epi
         LEFT JOIN qc_method_item as qmi on epi.ItemNo = qmi.ItemNo and epi.site = qmi.site and epi.bu_no = qmi.bu_no
         LEFT JOIN qc_method as qm on qmi.method_no = qm.method_no and qmi.site = qm.site and qmi.bu_no = qm.bu_no
@@ -155,8 +157,8 @@
 
     <!-- 新增检验项目 -->
     <insert id="qcItemSave" parameterType="QcItemData">
-        INSERT INTO eam_properties_item (site, bu_no, ItemNo, ItemDesc, DefaultValue, ValueType, ValueType_DB, ValueChooseFlag, CreatedDate, CreatedBy, MaxValue, MinValue, ItemRemark, ItemType, update_date, update_by, inspection_type_no, item_sampling_quantity, sampling_programme_no, sampling_level_no, default_sampling_proportion)
-        VALUES (#{site}, #{buNo}, #{itemNo}, #{itemDesc}, #{defaultValue}, #{valueType}, #{valueTypeDb}, #{valueChooseFlag}, GetDate(), #{createdBy}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{itemRemark}, #{itemType}, getDate(), #{updateBy}, #{inspectionTypeNo}, #{itemSamplingQuantity}, #{samplingProgrammeNo}, #{samplingLevelNo}, #{defaultSamplingProportion})
+        INSERT INTO eam_properties_item (site, bu_no, ItemNo, ItemDesc, DefaultValue, ValueType, ValueType_DB, ValueChooseFlag, CreatedDate, CreatedBy, MaxValue, MinValue, ItemRemark, ItemType, update_date, update_by, inspection_type_no, item_sampling_quantity, sampling_programme_no, sampling_level_no, default_sampling_proportion, collection_flag, collection_source)
+        VALUES (#{site}, #{buNo}, #{itemNo}, #{itemDesc}, #{defaultValue}, #{valueType}, #{valueTypeDb}, #{valueChooseFlag}, GetDate(), #{createdBy}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{itemRemark}, #{itemType}, getDate(), #{updateBy}, #{inspectionTypeNo}, #{itemSamplingQuantity}, #{samplingProgrammeNo}, #{samplingLevelNo}, #{defaultSamplingProportion}, #{collectionFlag}, #{collectionSource})
     </insert>
 
     <!-- 新增项目里的方法 -->
@@ -182,7 +184,9 @@
             item_sampling_quantity = #{itemSamplingQuantity},
             sampling_programme_no = #{samplingProgrammeNo},
             sampling_level_no = #{samplingLevelNo},
-            default_sampling_proportion = #{defaultSamplingProportion}
+            default_sampling_proportion = #{defaultSamplingProportion},
+            collection_flag = #{collectionFlag},
+            collection_source = #{collectionSource}
         WHERE site = #{site} and ItemNo = #{itemNo} and ItemType = #{itemType} and bu_no = #{buNo}
     </update>
 
@@ -1606,8 +1610,11 @@
             <if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
                 AND disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
             </if>
-            <if test = "query.state != null and query.state != ''">
-                AND state = #{query.state}
+            <if test = "query.states != null and query.states.size > 0">
+                AND state in
+                <foreach item="item" collection="query.states"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test = "query.inspectionResult != null and query.inspectionResult != ''">
                 AND inspection_result = #{query.inspectionResult}
@@ -1930,8 +1937,11 @@
             <if test = "query.sku != null and query.sku != ''">
                 AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku} + '%'
             </if>
-            <if test = "query.state != null and query.state != ''">
-                AND state = #{query.state}
+            <if test = "query.states != null and query.states.size > 0">
+                AND state in
+                <foreach item="item" collection="query.states"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test = "query.inspectionTypeNo != null and query.inspectionTypeNo != ''">
                 AND inspection_type_no = #{query.inspectionTypeNo}
@@ -2274,8 +2284,11 @@
             <if test = "query.inspectionNo != null and query.inspectionNo != ''">
                 AND inspection_no LIKE '%' + #{query.inspectionNo} + '%'
             </if>
-            <if test = "query.state != null and query.state != ''">
-                AND state = #{query.state}
+            <if test = "query.states != null and query.states.size > 0">
+                AND state in
+                <foreach item="item" collection="query.states"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test = "query.inspectionResult != null and query.inspectionResult != ''">
                 AND inspection_result = #{query.inspectionResult}
@@ -2631,8 +2644,11 @@
             <if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
                 AND disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
             </if>
-            <if test = "query.state != null and query.state != ''">
-                AND state = #{query.state}
+            <if test = "query.states != null and query.states.size > 0">
+                AND state in
+                <foreach item="item" collection="query.states"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test = "query.inspectionResult != null and query.inspectionResult != ''">
                 AND inspection_result = #{query.inspectionResult}
@@ -3324,9 +3340,11 @@
 
     <insert id="addEquipmentDataAcquisition" parameterType="QcFAIRecordData">
         insert into Equipment_data_acquisition
-            (site, bu_no, equipment_no, inspection_no, create_date, create_by)
+            (site, bu_no, equipment_no, inspection_no, create_date, create_by, item_no, collection_source)
         values
-            (#{site}, #{buNo}, #{actionBy}, #{inspectionNo}, getDate(), #{actionBy})
+        <foreach collection="list" item="item" separator=",">
+            (#{item.site}, #{item.buNo}, #{item.actionBy}, #{item.inspectionNo}, getDate(), #{item.actionBy}, #{item.itemNo}, #{item.collectionSource})
+        </foreach>
     </insert>
 
     <!-- 新增人员信息 -->
@@ -3352,7 +3370,9 @@
             equipment_no,
             inspection_no,
             create_date,
-            create_by
+            create_by,
+            item_no,
+            collection_source
         from Equipment_data_acquisition
         where site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
     </select>
@@ -3362,12 +3382,68 @@
             site,
             bu_no,
             #{inspectionNo} as inspectionNo,
-            item_no,
-            value1 as subDetailValue
+            #{itemNo} as itemNo,
+            ${collectionSource} as subDetailValue
         from Equipment_data_detail
-        where site = #{site} and bu_no = #{buNo} and equipment_no = #{equipmentNo}
+        where site = #{site} and bu_no = #{buNo} and equipment_no = #{equipmentNo} and ${collectionSource} is not null and ${collectionSource} <![CDATA[<>]]> ''
           and batch_no = (select MAX(batch_no) from Equipment_data_detail where site = #{site} and bu_no = #{buNo} and equipment_no = #{equipmentNo})
     </select>
+
+    <select id="getIQCDetail" parameterType="QcFAIRecordData" resultType="EquipmentDataAcquisitionData">
+        select
+            a.site,
+            a.bu_no,
+            #{actionBy} as equipmentNo,
+            #{inspectionNo} as inspectionNo,
+            a.item_no,
+            b.collection_source,
+            #{actionBy} as actionBy
+        from qc_iqc_detailed_record as a
+        left join eam_properties_item as b on a.site = b.site and a.bu_no = b.bu_no and a.item_no = b.ItemNo
+        where a.site = #{site} and a.bu_no = #{buNo} and a.inspection_no = #{inspectionNo} and b.ItemType = 'D' and b.inspection_type_no = '105' and b.collection_flag = 'Y'
+    </select>
+
+    <select id="getFAIDetail" parameterType="QcFAIRecordData" resultType="EquipmentDataAcquisitionData">
+        select
+            a.site,
+            a.bu_no,
+            #{actionBy} as equipmentNo,
+            #{inspectionNo} as inspectionNo,
+            a.item_no,
+            b.collection_source,
+            #{actionBy} as actionBy
+        from qc_fai_detailed_record as a
+        left join eam_properties_item as b on a.site = b.site and a.bu_no = b.bu_no and a.item_no = b.ItemNo
+        where a.site = #{site} and a.bu_no = #{buNo} and a.inspection_no = #{inspectionNo} and b.ItemType = 'D' and b.inspection_type_no = '106' and b.collection_flag = 'Y'
+    </select>
+
+    <select id="getIPQCDetail" parameterType="QcFAIRecordData" resultType="EquipmentDataAcquisitionData">
+        select
+            a.site,
+            a.bu_no,
+            #{actionBy} as equipmentNo,
+            #{inspectionNo} as inspectionNo,
+            a.item_no,
+            b.collection_source,
+            #{actionBy} as actionBy
+        from qc_ipqc_detailed_record as a
+        left join eam_properties_item as b on a.site = b.site and a.bu_no = b.bu_no and a.item_no = b.ItemNo
+        where a.site = #{site} and a.bu_no = #{buNo} and a.inspection_no = #{inspectionNo} and b.ItemType = 'D' and b.inspection_type_no = '101' and b.collection_flag = 'Y'
+    </select>
+
+    <select id="getFQCDetail" parameterType="QcFAIRecordData" resultType="EquipmentDataAcquisitionData">
+        select
+            a.site,
+            a.bu_no,
+            #{actionBy} as equipmentNo,
+            #{inspectionNo} as inspectionNo,
+            a.item_no,
+            b.collection_source,
+            #{actionBy} as actionBy
+        from qc_fqc_detailed_record as a
+        left join eam_properties_item as b on a.site = b.site and a.bu_no = b.bu_no and a.item_no = b.ItemNo
+        where a.site = #{site} and a.bu_no = #{buNo} and a.inspection_no = #{inspectionNo} and b.ItemType = 'D' and b.inspection_type_no = '107' and b.collection_flag = 'Y'
+    </select>
 </mapper>