41388 工单界面不显示产线名称

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

@@ -7,7 +7,6 @@ import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService;
 import cn.estsh.i3plus.mes.apiservice.util.DateUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.MathOperation;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
@@ -22,13 +21,13 @@ import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.pojo.model.wms.WmsProductModel;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -280,6 +279,25 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         DdlPreparedPack.getStringSmallerPack(bean.getEndTimeEnd(), "planEndTime", packBean);
         packBean.setOrderByStr(" order by createDatetime desc,workOrderSeq asc,workOrderNo asc ");
     }
+    @Override
+    protected void setBeanModel(List<MesWorkOrder> mesWorkOrderList) {
+        //查询工作中心名称
+        if(CollectionUtils.isEmpty(mesWorkOrderList)){
+            return;
+        }
+        MesWorkOrder mesWorkOrder = mesWorkOrderList.iterator().next();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode());
+        DdlPreparedPack.getInPackList(mesWorkOrderList.stream().map(MesWorkOrder::getWorkCenterCode).filter(workCenterCode -> !StringUtils.isEmpty(workCenterCode)).distinct().collect(Collectors.toList()), "workCenterCode", ddlPackBean);
+        List<MesWorkCenter> mesWorkCenterList = mesWorkCenterRDao.findByHqlWhere(ddlPackBean);
+        if (CollectionUtils.isEmpty(mesWorkCenterList)) {
+           return;
+        }
+        Map<String, String> mesWorkCenterMap = mesWorkCenterList.stream().collect(Collectors.toMap(MesWorkCenter::getWorkCenterCode, MesWorkCenter::getWorkCenterName));
+        mesWorkOrderList.forEach(t->{
+            t.setWorkCenterName(mesWorkCenterMap.get(t.getWorkCenterCode()));
+        });
+
+    }
 
     @Override
     protected void onInsertBean(MesWorkOrder item) {