工单管理模块(显示问题修复)、湿料计划(混料BUG修复)

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;
     }
 
     /**

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>