From d79301f5881a966c64ccb4cc39339bb647304f1c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 2 Dec 2024 14:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mes/MesReportWorkMapper.xml        |  2 +-
 .../ProBPOrderWorkorderController.java        | 11 ++++++
 .../plan/mapper/ProOrderWorkorderMapper.java  |  2 +
 .../service/IProOrderWorkorderService.java    |  2 +
 .../impl/ProOrderWorkorderServiceImpl.java    |  7 +++-
 .../mapper/plan/ProOrderWorkorderMapper.xml   | 16 ++++++++
 .../impl/QcCheckTaskIncomeServiceImpl.java    | 38 +++++++++++++------
 .../mapper/wms/BaseEquipmentMapper.xml        |  3 +-
 .../mapper/wms/BaseProductMapper.xml          |  6 ++-
 9 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index 6c89b5ce..5b8ffb94 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -552,7 +552,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="orderCode != null  and orderCode != ''"> and pow.workorder_code_sap like concat('%', #{orderCode}, '%')</if>
 		<if test="workorderCode != null  and workorderCode != ''"> and pow.workorder_code like concat('%', #{workorderCode}, '%')</if>
 		</where>
-		order by pow.product_date desc
+		order by pow.product_date desc,mrw.machineName
 	</select>
 	<select id="getReportList" resultType="com.op.mes.domain.MesReportWork">
 		select
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java
index 5a410b24..7f3d0ea5 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java
@@ -227,4 +227,15 @@ public class ProBPOrderWorkorderController extends BaseController {
     public AjaxResult deleteWetMaterial(@PathVariable String[] workorderIds) {
         return toAjax(proOrderWorkorderService.deleteWetMaterial(workorderIds));
     }
+
+    /**
+     * 白坯bom列表
+     */
+    @RequiresPermissions("mes:bppro:workorder:list")
+    @GetMapping("/getBPNBomList")
+    public TableDataInfo getBPNBomList(ProOrderWorkorder proOrderWorkorder) {
+        startPage();
+        List<ProOrderWorkorder> list = proOrderWorkorderService.getBPNBomList(proOrderWorkorder);
+        return getDataTable(list);
+    }
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index 7e538326..2e024772 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -264,5 +264,7 @@ public interface ProOrderWorkorderMapper {
     String getPreviousLineCode(String workorderId);//查询之前的产线
 
     String getPlanLineCodes(String workorderId);
+
+    List<ProOrderWorkorder> getBPNBomList(ProOrderWorkorder proOrderWorkorder);
 }
 
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
index dc15c760..0d5d540b 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
@@ -161,4 +161,6 @@ public interface IProOrderWorkorderService {
     int updateWorkOrderBom(String workorderCode);
 
     List<HashMap> getPowExportData(ProOrderWorkorder proOrderWorkorder);
+
+    List<ProOrderWorkorder> getBPNBomList(ProOrderWorkorder proOrderWorkorder);
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index bc28b7a3..93941b44 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -1832,7 +1832,12 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             logger.info(poolName + "工厂进行切线，没有新产线需要点检。");
         }
     }
-
+    @Override
+    @DS("#header.poolName")
+    public List<ProOrderWorkorder> getBPNBomList(ProOrderWorkorder proOrderWorkorder) {
+        List<ProOrderWorkorder> workorderList = proOrderWorkorderMapper.getBPNBomList(proOrderWorkorder);
+        return workorderList;
+    }
     public static void main(String args[]) {
         String s = "000800003044";
         System.out.println(s.substring(3));
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index a1fb6c81..bdb69452 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -1106,5 +1106,21 @@
         where workorder_id = #{workorderId}
         and del_flag = '0'
     </select>
+    <select id="getBPNBomList" resultType="com.op.plan.domain.ProOrderWorkorder">
+        select bom.product_code productCode,
+               bp.product_desc_zh productName
+        from base_bom_component bom
+                 left join base_product bp on bp.product_code = bom.product_code
+        where
+            (
+             concat('0000000',bom.component) in(select product_code from pro_order_workorder where workorder_id = #{workorderId})
+             or (bom.component in(select product_code from pro_order_workorder where workorder_id = #{workorderId}))
+            )
+        and (
+             concat('0000000',bom.cumc) in(select product_code from pro_order_workorder where workorder_id = #{workorderId})
+             or (bom.cumc in(select product_code from pro_order_workorder where workorder_id = #{workorderId}))
+        )
+        order by bom.product_code
+    </select>
 
 </mapper>
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 1d11dbd6..b0c20b1a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -751,6 +751,20 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				System.out.println("base_file:"+n);
 			}
 
+			/**去掉测量值0**/
+			String actualValueStr = detail.getActualValue();
+			if(StringUtils.isNotBlank(actualValueStr)){
+				if(actualValueStr.indexOf("[")>=0 && actualValueStr.indexOf("]")>=0){
+					JSONArray codeArray = JSONArray.parseArray(actualValueStr);
+					for (int c1 = 0; c1 < codeArray.size(); c1++) {
+						if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
+							codeArray.remove(codeArray.get(c1));
+						}
+					}
+
+					detail.setActualValue(JSONArray.toJSONString(codeArray));
+				}
+			}
 		}
 		if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){
 			qcCheckTask.setSampleQuality(sampleQuality);
@@ -1029,17 +1043,19 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				System.out.println("base_file:"+n);
 			}
 
-//			/**去掉测量值0**/
-//			String actualValueStr = detail.getActualValue();
-//			if(StringUtils.isNotBlank(actualValueStr)){
-//				JSONArray codeArray = JSONArray.parseArray(actualValueStr);
-//				for (int c1 = 0; c1 < codeArray.size(); c1++) {
-//					if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
-//						codeArray.remove(codeArray.get(c1));
-//					}
-//				}
-//				detail.setActualValue(codeArray.toJSONString());
-//			}
+			/**去掉测量值0**/
+			String actualValueStr = detail.getActualValue();
+			if(StringUtils.isNotBlank(actualValueStr)){
+				if(actualValueStr.indexOf("[")>=0 && actualValueStr.indexOf("]")>=0){
+					JSONArray codeArray = JSONArray.parseArray(actualValueStr);
+					for (int c1 = 0; c1 < codeArray.size(); c1++) {
+						if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
+							codeArray.remove(codeArray.get(c1));
+						}
+					}
+					detail.setActualValue(JSONArray.toJSONString(codeArray));
+				}
+			}
 
 		}
 		if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
index 929887af..bd4f7f9e 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
@@ -203,7 +203,8 @@
             <if test="inventoryNumber != null  and inventoryNumber != ''">and inventory_number = #{inventoryNumber}</if>
             <if test="unitMeasurement != null  and unitMeasurement != ''">and unit_measurement = #{unitMeasurement}</if>
             <if test="sapCode != null  and sapCode != ''">and sap_code = #{sapCode}</if>
-            <if test="sapName != null  and sapName != ''">and sap_name = #{sapName}</if>
+            <if test="sapName != null  and sapName != ''">and (sap_name like concat('%',#{sapName},'%') or sap_code like concat('%',#{sapName},'%'))
+            </if>
             <if test="factoryWorkshop != null  and factoryWorkshop != ''">and factory_workshop like concat('%', #{factoryWorkshop},'%')</if>
             and del_flag ='0'
         </where>
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
index 5c710773..6ce00425 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
@@ -154,7 +154,11 @@
             <if test="reportRate != null  and reportRate != ''">and bp.report_rate = #{reportRate}</if>
             <if test="mvgr5 != null  and mvgr5 != ''">and bp.mvgr5 like concat('%', #{mvgr5},'%') </if>
             <if test="cpkType != null  and cpkType != ''">and bpa.cpk_type =#{cpkType} </if>
-            and bp.del_flag = '0' and bp.product_code not like '00000000%'
+            and bp.del_flag = '0' and (
+            bp.product_code like '00000001%' or bp.product_code like '00000002%' or bp.product_code like '00000003%'
+            or bp.product_code like '00000004%' or bp.product_code like '00000005%' or bp.product_code like '00000006%'
+            or bp.product_code like '00000007%'
+            )
         </where>
         order by bp.product_code asc
     </select>