From f10988a3c32d915324cdcf8b479527c70264c23a Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 4 Aug 2023 11:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97(=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D)=E3=80=81=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92(?=
 =?UTF-8?q?=E6=B7=B7=E6=96=99BUG=E4=BF=AE=E5=A4=8D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/service/impl/ProOrderWorkorderServiceImpl.java   | 8 ++++++--
 .../resources/mapper/plan/ProWetMaterialPlanMapper.xml    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

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 0603fc7dc..6f3391bc3 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
@@ -64,8 +64,12 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
     @Override
     @DS("#header.poolName")
     public List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder) {
-
-        return proOrderWorkorderMapper.selectProOrderWorkorderList(proOrderWorkorder);
+        List<ProOrderWorkorder> workorderList = proOrderWorkorderMapper.selectProOrderWorkorderList(proOrderWorkorder);
+        for (ProOrderWorkorder workorder : workorderList) {
+            // 通过设备code查询出机型名称
+            workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
+        }
+        return workorderList;
     }
 
     /**
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml
index edf015f16..03c258f60 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBMSList" resultType="com.op.plan.domain.BMS">
 		SELECT bucket_id AS 'bucketId', material_id AS 'materialId',shift_id AS 'shiftId'
 		FROM pro_wet_material_plan_detail
-		WHERE status = '0' AND CONVERT(date, plan_time) = #{planTime}
+		WHERE CONVERT(date, plan_time) = #{planTime}
 		GROUP BY bucket_id,material_id,shift_id
 	</select>