From 39ac73dbed8ceb5e1c2356bfeb4b56e363994226 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 28 Jul 2023 16:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92(=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/mes/domain/ProWetMaterialPlanDetail.java  | 12 ++++++++++++
 .../com/op/mes/mapper/ProWetMaterialPlanMapper.java  |  8 ++++++++
 .../service/impl/ProWetMaterialPlanServiceImpl.java  |  3 ++-
 .../mapper/mes/ProWetMaterialPlanDetailMapper.xml    |  2 +-
 .../mapper/mes/ProWetMaterialPlanMapper.xml          |  8 +++++++-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java
index 6232b3b85..8de08b312 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java
@@ -97,6 +97,17 @@ public class ProWetMaterialPlanDetail extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date productDate;
 
+    // 料罐名称
+    private String bucketName;
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
     public String getId() {
         return id;
     }
@@ -284,6 +295,7 @@ public class ProWetMaterialPlanDetail extends BaseEntity {
                 .append("planTime",getPlanTime())
                 .append("workorderCode",getWorkorderCode())
                 .append("productDate",getProductDate())
+                .append("bucketName",getBucketName())
                 .toString();
     }
 }
\ No newline at end of file
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java
index 8943fab1d..43e0876d4 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java
@@ -120,4 +120,12 @@ public interface ProWetMaterialPlanMapper {
      * @return
      */
     String selectWetMaterialPlanByPlanTime(Date planTime);
+
+    /**
+     * 通过料罐id查询料罐名称
+     *
+     * @param bucketId
+     * @return
+     */
+    String selectBucketNameById(String bucketId);
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java
index 9b312dff8..eb48dacac 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java
@@ -219,9 +219,10 @@ public class ProWetMaterialPlanServiceImpl implements IProWetMaterialPlanService
     @DS("#header.poolName")
     public AjaxResult getWetMaterialPlanDetailListById(String id) {
         List<ProWetMaterialPlanDetail> detailList = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailListById(id);
-        // 获取班次名称
+        // 获取班次名称和料罐名称
         for (int i = 0;i < detailList.size();i++){
             detailList.get(i).setShiftDesc(proWetMaterialPlanMapper.selectShiftById(String.valueOf(detailList.get(i).getShiftId())));
+            detailList.get(i).setBucketName(proWetMaterialPlanMapper.selectBucketNameById(detailList.get(i).getBucketId()));
         }
         return success(detailList);
     }
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml
index 99660b51b..59176350a 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml
@@ -65,7 +65,7 @@
     </select>
 
     <select id="selectProWetMaterialPlanDetailListById" parameterType="String" resultMap="ProWetMaterialPlanDetailResult">
-        select p.*,w.workorder_code,w.product_name,w.product_date
+        select p.*,w.workorder_code,w.product_date
         from pro_wet_material_plan_detail p join pro_order_workorder w
         on w.workorder_id = p.workorder_id
         where p.wet_material_plan_id = #{id}
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanMapper.xml
index c206d71a0..cf67e83a9 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanMapper.xml
@@ -86,7 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where CONVERT(date, plan_time) = CONVERT(date, #{planTime})
 	</select>
 
-    <insert id="insertProWetMaterialPlan" parameterType="ProWetMaterialPlan">
+	<select id="selectBucketNameById" resultType="java.lang.String">
+		select equipment_name as 'bucketName'
+		from base_equipment
+		where equipment_type_code = 'equ_type_lg' and equipment_id = #{bucketId}
+	</select>
+
+	<insert id="insertProWetMaterialPlan" parameterType="ProWetMaterialPlan">
 		insert into pro_wet_material_plan
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="id != null">id,</if>