bu修改

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

@@ -1050,7 +1050,7 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService {
         if (data.getItemList() != null && !data.getItemList().isEmpty()) {
             for (QcSpecData item : data.getItemList()) {
                 item.setSite(data.getSite());
-                item.setBuNo(data.getBuNo());
+                item.setBuNo(item.getBuNo());
                 item.setPartNo(data.getPartNo());
                 item.setCreateBy(data.getCreateBy());
                 qcBaseInfoMapper.qcSpecSave(item);
@@ -1064,7 +1064,7 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService {
         if (data.getItemList() != null && !data.getItemList().isEmpty()) {
             for (QcSpecData item : data.getItemList()) {
                 item.setSite(data.getSite());
-                item.setBuNo(data.getBuNo());
+                item.setBuNo(item.getBuNo());
                 item.setPartNo(data.getPartNo());
                 qcBaseInfoMapper.qcSpecUpdate(item);
             }

cclqms-java/src/main/resources/mapper/pms/QcBaseInfoMapper.xml

@@ -1783,9 +1783,13 @@
             total_inspection_duration AS totalInspectionDuration,
             default_flag AS defaultFlag
         FROM IPQC_Patrol_Configuration
-        WHERE site = #{site}
-          AND bu_no = #{buNo}
+        <where>
+            site = #{site}
             AND part_no = #{partNo}
+            <if test="buNo != null and buNo != ''">
+                AND bu_no = #{buNo}
+            </if>
+        </where>
         ORDER BY default_flag DESC, operation_desc
     </select>
 
@@ -1898,7 +1902,12 @@
         LEFT JOIN qc_sampling_inspection_programme qsip ON a.site = qsip.site AND a.bu_no = qsip.bu_no AND a.sampling_programme_no = qsip.sampling_programme_no
         LEFT JOIN view_Supplier vs ON a.site = vs.site AND a.manufacturer_id = vs.SupplierID
         LEFT JOIN Customer cu ON a.site = cu.site AND a.customer_id = cu.CustomerID
-        WHERE a.site = #{site} AND a.bu_no = #{buNo} AND a.part_no = #{partNo}
+        <where>
+            a.site = #{site}  AND a.part_no = #{partNo}
+            <if test="buNo != null and buNo != ''">
+                AND a.bu_no = #{buNo}
+            </if>
+        </where>
     </select>
 
     <insert id="qcSpecSave" parameterType="com.gaotao.modules.pms.data.QcSpecData">
@@ -1932,7 +1941,13 @@
 
     <delete id="qcSpecDelete" parameterType="com.gaotao.modules.pms.data.QcSpecData">
         DELETE FROM qc_spec
-        WHERE site = #{site} AND bu_no = #{buNo} AND part_no = #{partNo} AND item_no = #{itemNo} AND inspection_type_no = #{inspectionTypeNo}
+        <where>
+            site = #{site}  AND part_no = #{partNo} AND item_no = #{itemNo} AND inspection_type_no = #{inspectionTypeNo}
+            <if test="buNo != null and buNo != ''">
+                AND bu_no = #{buNo}
+            </if>
+        </where>
+
     </delete>
 
     <select id="getQcSpecItemList" resultType="com.gaotao.modules.pms.data.QcSpecData">
@@ -1953,7 +1968,10 @@
         LEFT JOIN qc_method_item qmi ON a.ItemNo = qmi.ItemNo AND a.site = qmi.site AND a.bu_no = qmi.bu_no
         LEFT JOIN qc_method qm ON qmi.method_no = qm.method_no AND qmi.site = qm.site AND qmi.bu_no = qm.bu_no
         <where>
-            a.site = #{site} AND a.bu_no = #{buNo} AND b.part_no IS NULL
+            a.site = #{site}  AND b.part_no IS NULL
+            <if test="buNo != null and buNo != ''">
+                AND a.bu_no = #{buNo}
+            </if>
             <if test="inspectionTypeNo != null and inspectionTypeNo != ''">
                 AND a.inspection_type_no = #{inspectionTypeNo}
             </if>
@@ -1964,6 +1982,7 @@
                 AND a.ItemDesc LIKE '%' + #{itemDesc} + '%'
             </if>
         </where>
+        order by a.ItemNo
     </select>
 
     <!-- 检验标准预警配置 -->
@@ -1994,11 +2013,15 @@
 
     <delete id="deleteQcSpecWarningBySpec" parameterType="com.gaotao.modules.pms.data.QcSpecWarningData">
         DELETE FROM qc_spec_warning
-        WHERE site = #{site}
-          AND bu_no = #{buNo}
+        <where>
+            site = #{site}
             AND part_no = #{partNo}
             AND item_no = #{itemNo}
             AND inspection_type_no = #{inspectionTypeNo}
+            <if test="buNo != null and buNo != ''">
+                AND bu_no = #{buNo}
+            </if>
+        </where>
     </delete>
 
     <insert id="insertQcSpecWarning" parameterType="com.gaotao.modules.pms.data.QcSpecWarningData">