From d152a464ca00206132b1bbfdd6b331f1baf8e25c Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Mon, 20 Jan 2025 14:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesPackingRuleDetailService.java          | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java
index 2a0f5f5..0b9e0a8 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java
@@ -1,17 +1,28 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesPackingPartTypeService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleDetailService;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType;
 import cn.estsh.i3plus.pojo.mes.bean.MesPackingRuleDetail;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
 public class MesPackingRuleDetailService extends BaseMesService<MesPackingRuleDetail> implements IMesPackingRuleDetailService {
 
+    @Autowired
+    private IMesPackingPartTypeService packingPartTypeService;
+
     @Override
     protected void setPackQueryBean(MesPackingRuleDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
@@ -19,4 +30,20 @@ public class MesPackingRuleDetailService extends BaseMesService<MesPackingRuleDe
         DdlPreparedPack.getStringEqualPack(bean.getPartType(), MesExtConstWords.PART_TYPE, packBean);
     }
 
+    @Override
+    public void setBeanModel(List<MesPackingRuleDetail> list) {
+        if (CollectionUtils.isEmpty(list)) return;
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(list.get(0).getOrganizeCode());
+        List<MesPackingPartType> packingPartTypeList = packingPartTypeService.findAll(packBean);
+        Map<String, String> packingPartTypeMap = CollectionUtils.isEmpty(packingPartTypeList) ? null :
+                packingPartTypeList.stream().filter(o -> null != o).collect(Collectors.toMap(MesPackingPartType::getPartType, MesPackingPartType::getPartTypeName));
+
+        if (!CollectionUtils.isEmpty(packingPartTypeMap)) {
+            list.forEach(o -> {
+                o.setPartTypeName(packingPartTypeMap.get(o.getPartType()));
+            });
+        }
+    }
+
 }