Merge branch 'test-temp-wj-250117-pack' into dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingPartTypeService.java

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType;
+
+public interface IMesPackingPartTypeService extends IBaseMesService<MesPackingPartType> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingPartTypeController.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api("成品包装类型零件信息")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingPartType")
+public class MesPackingPartTypeController extends BaseMesController<MesPackingPartType>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesPackingPartTypeService;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesPackingPartTypeService extends BaseMesService<MesPackingPartType> implements IMesPackingPartTypeService {
+
+    @Override
+    protected void setPackQueryBean(MesPackingPartType bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartName(), MesExtConstWords.PART_NAME, packBean);
+    }
+
+}

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()));
+            });
+        }
+    }
+
 }

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java

@@ -239,6 +239,8 @@ public class MesExtConstWords {
     public static final String DEFAULT_FLAG = "defaultFlag";
     //零件类型
     public static final String PART_TYPE = "partType";
+    //零件类型名称
+    public static final String PART_TYPE_NAME = "partTypeName";
 
     //时间[开始/结束]条件
     public static final String START_TIME_START = "startTimeStart";