forked from I3-YF/i3plus-mes-pcn-yfai
pcn 发运单打印
parent
fc1c59a8c6
commit
7a4a4db923
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesTemplateService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Api("获取系统配置的模版信息")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN)
|
||||
public class MesLabelTemplateExtController {
|
||||
|
||||
@Autowired
|
||||
private IConfigService configService;
|
||||
|
||||
@Autowired
|
||||
private IMesTemplateService mesTemplateService;
|
||||
|
||||
@GetMapping("/label-template/by-module-or-template/get")
|
||||
@ApiOperation(value = "获取系统配置的模版信息")
|
||||
public ResultBean queryMesLabelTemplate(String organizeCode, String moduleCode, String templateCode) {
|
||||
try {
|
||||
ValidatorBean.checkNotNull(organizeCode, "工厂代码不能为空");
|
||||
if (StringUtils.isEmpty(moduleCode) && StringUtils.isEmpty(templateCode)) {
|
||||
ValidatorBean.checkNotNull(moduleCode, "模版配置代码不能为空");
|
||||
}
|
||||
if (!StringUtils.isEmpty(moduleCode)) {
|
||||
MesConfig config = configService.getMesConfigByCfgCode(moduleCode, organizeCode);
|
||||
if (null == config || StringUtils.isEmpty(config.getCfgValue())) templateCode = config.getCfgValue();
|
||||
}
|
||||
ValidatorBean.checkNotNull(templateCode, "模版代码不能为空");
|
||||
return ResultBean.success("查询成功").setResultObject(mesTemplateService.getMesLabelTemplate(templateCode, organizeCode));
|
||||
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 排序发运处理接口
|
||||
**/
|
||||
public interface ISortShippingDispatchStrategyService {
|
||||
|
||||
default List<MesShippingOrderManagement> getShippingOrderManagementList(MesShippingOrderManagement bean) {
|
||||
return null;
|
||||
}
|
||||
|
||||
default List<MesShippingOrderManagementDetail> getShippingOrderManagementDetailList(String organizeCode, List<Long> idList, Object[] obj, String[] str) {
|
||||
return null;
|
||||
}
|
||||
|
||||
default void saveShippingOrderManagementList(List<MesShippingOrderManagement> pullingOrderInfos) {}
|
||||
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.seres.IMesCimSeresSrmRunSheetJisRepository;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description : 重庆龙兴发运单
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class CqCxSortShippingPrintStrategyService extends SortShippingDispatchStrategyService implements IPrintTemplateStrategyService {
|
||||
|
||||
@Autowired
|
||||
private IMesCimSeresSrmRunSheetJisRepository cimSeresSrmRunSheetJisRepository;
|
||||
|
||||
@Override
|
||||
public List<MesShippingOrderManagement> getShippingOrderManagementList(MesShippingOrderManagement bean) {
|
||||
return super.getShippingOrderManagementList(bean);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesShippingOrderManagementDetail> getShippingOrderManagementDetailList(String organizeCode, List<Long> idList, Object[] obj, String[] str) {
|
||||
return super.getShippingOrderManagementDetailList(organizeCode, idList, obj, str);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveShippingOrderManagementList(List<MesShippingOrderManagement> shippingOrderManagementList) {
|
||||
super.saveShippingOrderManagementList(shippingOrderManagementList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> shippingOrderManagementList) {
|
||||
|
||||
List<Long> pidList = shippingOrderManagementList.stream().map(MesShippingOrderManagement::getId).collect(Collectors.toList());
|
||||
List<String> shippingCodeList = shippingOrderManagementList.stream().map(MesShippingOrderManagement::getShippingCode).collect(Collectors.toList());
|
||||
List<MesShippingOrderManagementDetail> shippingOrderManagementDetailList = getShippingOrderManagementDetailList(bean.getOrganizeCode(), pidList, null, null);
|
||||
|
||||
log.info("工厂{}排序发运打印 --- 查询发运单明细信息:{}条 --- {}", bean.getOrganizeCode(),
|
||||
CollectionUtils.isEmpty(shippingOrderManagementDetailList) ? MesPcnExtConstWords.ZERO : shippingOrderManagementDetailList.size(), Thread.currentThread().getName());
|
||||
|
||||
Map<Long, List<MesShippingOrderManagementDetail>> detailByPidMap = CollectionUtils.isEmpty(shippingOrderManagementDetailList) ? null :
|
||||
shippingOrderManagementDetailList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPid()))).collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getPid));
|
||||
|
||||
|
||||
// List<MesCimSeresSrmRunSheetJis> cimSeresSrmRunSheetJisList = getCimSeresSrmRunSheetJisList(bean.getOrganizeCode(), shippingCodeList);
|
||||
|
||||
|
||||
//遍历处理每个发运单主表
|
||||
for (MesShippingOrderManagement shippingOrderManagement : shippingOrderManagementList) {
|
||||
//一张实体发运单包含三部分信息（顶部的通用数据、中部的第一份表格数据，底部的第二份表格数据）
|
||||
//取出当前发运单的明细信息
|
||||
List<MesShippingOrderManagementDetail> details = null == detailByPidMap ? null : detailByPidMap.get(shippingOrderManagement.getId());
|
||||
|
||||
|
||||
|
||||
shippingOrderManagement.setPrintCount(StringUtil.isEmpty(shippingOrderManagement.getPrintCount())? 1 : shippingOrderManagement.getPrintCount()+1);
|
||||
shippingOrderManagement.setLastPrintTime(TimeTool.getNowTime(true));
|
||||
shippingOrderManagement.setLastPrintUser(bean.getUserInfo());
|
||||
ConvertBean.serviceModelUpdate(shippingOrderManagement, bean.getUserInfo());
|
||||
}
|
||||
|
||||
saveShippingOrderManagementList(shippingOrderManagementList);
|
||||
|
||||
return ResultBean.success("发运单打印成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(null);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping.ISortShippingDispatchStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository;
|
||||
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.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 发运单查询
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public abstract class SortShippingDispatchStrategyService implements ISortShippingDispatchStrategyService {
|
||||
|
||||
@Autowired
|
||||
public MesShippingOrderManagementRepository shippingOrderManagementRepository;
|
||||
|
||||
@Autowired
|
||||
public MesShippingOrderManagementDetailRepository shippingOrderManagementDetailRepository;
|
||||
|
||||
@Override
|
||||
public List<MesShippingOrderManagement> getShippingOrderManagementList(MesShippingOrderManagement bean) {
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
|
||||
List<String> shippingGroupCodeList = !StringUtil.isEmpty(bean.getShippingGroupCode()) ? Arrays.asList(bean.getShippingGroupCode().split(MesPcnExtConstWords.COMMA)) : null;
|
||||
if (!CollectionUtils.isEmpty(shippingGroupCodeList)) {
|
||||
if (shippingGroupCodeList.size() == 1) DdlPreparedPack.getStringEqualPack(shippingGroupCodeList.get(0), MesPcnExtConstWords.SHIPPING_GROUP_CODE, packBean);
|
||||
else DdlPreparedPack.getInPackList(shippingGroupCodeList, MesPcnExtConstWords.SHIPPING_GROUP_CODE, packBean);
|
||||
}
|
||||
DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), MesPcnExtConstWords.SHIPPING_CODE, packBean);
|
||||
DdlPreparedPack.getIsNull(MesPcnExtConstWords.LAST_PRINT_TIME, packBean);
|
||||
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{MesPcnExtConstWords.CREATE_DATE_TIME}, packBean);
|
||||
return shippingOrderManagementRepository.findByHqlTopWhere(packBean,10);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesShippingOrderManagementDetail> getShippingOrderManagementDetailList(String organizeCode, List<Long> idList, Object[] obj, String[] str) {
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
if (idList.size() == 1) DdlPreparedPack.getNumEqualPack(idList.get(0), MesPcnExtConstWords.PID, packBean);
|
||||
else DdlPreparedPack.getInPackList(idList, MesPcnExtConstWords.PID, packBean);
|
||||
if (null != obj && null != str) DdlPreparedPack.getOrderByPack(obj, str, packBean);
|
||||
return shippingOrderManagementDetailRepository.findByHqlWhere(packBean);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveShippingOrderManagementList(List<MesShippingOrderManagement> shippingOrderManagementList) {
|
||||
shippingOrderManagementRepository.saveAll(shippingOrderManagementList);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,140 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.edi.wuhu.MesCimCheryOrder;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
|
||||
import cn.estsh.i3plus.pojo.mes.model.MesShippingOrderManagementDetailModel;
|
||||
import cn.estsh.i3plus.pojo.mes.model.MesShippingOrderManagementModel;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesCimCheryOrderRepository;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* @Description : 芜湖发运单
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class WuhuSortShippingPrintStrategyService extends SortShippingDispatchStrategyService implements IPrintTemplateStrategyService {
|
||||
|
||||
@Autowired
|
||||
private IMesConfigService configService;
|
||||
|
||||
@Autowired
|
||||
private MesCimCheryOrderRepository cimCheryOrderRepository;
|
||||
|
||||
@Override
|
||||
public List<MesShippingOrderManagement> getShippingOrderManagementList(MesShippingOrderManagement bean) {
|
||||
return super.getShippingOrderManagementList(bean);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesShippingOrderManagementDetail> getShippingOrderManagementDetailList(String organizeCode, List<Long> idList, Object[] obj, String[] str) {
|
||||
return super.getShippingOrderManagementDetailList(organizeCode, idList, obj, str);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveShippingOrderManagementList(List<MesShippingOrderManagement> shippingOrderManagementList) {
|
||||
super.saveShippingOrderManagementList(shippingOrderManagementList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> shippingOrderManagementList) {
|
||||
|
||||
MesConfig config = configService.getMesConfigNoError(bean.getOrganizeCode(), "WU_HU_SUPPLIER");
|
||||
String supplierNo = (null == config || StringUtils.isEmpty(config.getCfgValue())) ? MesPcnExtConstWords.EMPTY : config.getCfgValue();
|
||||
|
||||
List<MesShippingOrderManagementModel> modelList = new ArrayList<>();
|
||||
//把查出来的发运单打印并修改打印状态为已打印-
|
||||
for (MesShippingOrderManagement shippingOrderManagement : shippingOrderManagementList) {
|
||||
MesShippingOrderManagementModel model = new MesShippingOrderManagementModel();
|
||||
String shippingCodePrefix = shippingOrderManagement.getShippingCode().substring(0, shippingOrderManagement.getShippingCode().length() - 3);
|
||||
String shippingCodeSuffix = shippingOrderManagement.getShippingCode().substring(shippingOrderManagement.getShippingCode().length() - 3);
|
||||
model.setShippingCode(shippingCodePrefix);
|
||||
model.setShippingCodeAfter3(shippingCodeSuffix);
|
||||
model.setShippingCodeWhole(shippingOrderManagement.getShippingCode());
|
||||
|
||||
//查询原始报文
|
||||
List<MesCimCheryOrder> cheryOrderList = getCheryOrder(shippingOrderManagement.getOrganizeCode(), shippingOrderManagement.getShippingCode());
|
||||
Map<String, List<MesCimCheryOrder>> cheryOrderMap = new HashMap<>();
|
||||
if (cheryOrderList != null && !cheryOrderList.isEmpty()) {
|
||||
MesCimCheryOrder cheryOrder = cheryOrderList.get(0);
|
||||
model.setPlantName(cheryOrder.getPlantName());
|
||||
model.setPartkitName(cheryOrder.getPartkitName());
|
||||
model.setDeliverySendSequence(cheryOrder.getDeliverySendSequence());
|
||||
model.setReceiveDockName(cheryOrder.getReceiveDockNo()+"--"+cheryOrder.getReceiveDockName());
|
||||
model.setLastRecRequireTime(cheryOrder.getLastRecRequireTime());
|
||||
//根据cheryOrder的workshopNo获取对应的车间名称
|
||||
String workshopName = getWorkshopName(cheryOrder.getOrganizeCode(), cheryOrder.getWorkshopNo());
|
||||
model.setWorkShop(workshopName);
|
||||
model.setCreateDateTime(cheryOrder.getCreateDatetime());
|
||||
model.setPrintDateTime(TimeTool.getNowTime(true));
|
||||
cheryOrderMap = cheryOrderList.stream().collect(Collectors.groupingBy(MesCimCheryOrder::getVin));
|
||||
}
|
||||
|
||||
//查询发运单明细
|
||||
List<MesShippingOrderManagementDetail> shipOrderPartInfos = getShippingOrderManagementDetailList(
|
||||
bean.getOrganizeCode(), Stream.of(shippingOrderManagement.getId()).collect(Collectors.toList()),
|
||||
new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"boxNum"});
|
||||
if (!CollectionUtils.isEmpty(shipOrderPartInfos)) {
|
||||
List<MesShippingOrderManagementDetailModel> detailList = new ArrayList<>();
|
||||
shipOrderPartInfos = shipOrderPartInfos.stream().sorted(Comparator.comparing(MesShippingOrderManagementDetail::getCustInfoSeq)).collect(Collectors.toList());
|
||||
for (MesShippingOrderManagementDetail shipOrderPartInfo : shipOrderPartInfos) {
|
||||
MesShippingOrderManagementDetailModel detailModel = new MesShippingOrderManagementDetailModel();
|
||||
detailModel.setPartNo(shipOrderPartInfo.getPartNo());
|
||||
detailModel.setPartName(shipOrderPartInfo.getPartName());
|
||||
detailModel.setQty(shipOrderPartInfo.getPlanQty());
|
||||
detailModel.setBoxNo(shipOrderPartInfo.getCustInfoSeq());
|
||||
detailModel.setSupplierNo(supplierNo);
|
||||
detailModel.setVin(shipOrderPartInfo.getVin().substring(shipOrderPartInfo.getVin().length()-8));
|
||||
MesCimCheryOrder order = cheryOrderMap.get(shipOrderPartInfo.getVin()).get(0);
|
||||
if (order != null) {
|
||||
detailModel.setWholePartNo(order.getMaterialNo());
|
||||
}
|
||||
detailList.add(detailModel);
|
||||
}
|
||||
model.setShipOrderPartInfos(detailList);
|
||||
}
|
||||
|
||||
//查询原有报文 根据shippingCode;
|
||||
shippingOrderManagement.setPrintCount(StringUtil.isEmpty(shippingOrderManagement.getPrintCount())?1:shippingOrderManagement.getPrintCount()+1);
|
||||
shippingOrderManagement.setLastPrintTime(TimeTool.getNowTime(true));
|
||||
shippingOrderManagement.setLastPrintUser(bean.getUserInfo());
|
||||
ConvertBean.serviceModelUpdate(shippingOrderManagement, bean.getUserInfo());
|
||||
modelList.add(model);
|
||||
}
|
||||
|
||||
saveShippingOrderManagementList(shippingOrderManagementList);
|
||||
|
||||
return ResultBean.success("发运单打印成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(modelList);
|
||||
}
|
||||
|
||||
private List<MesCimCheryOrder> getCheryOrder(String organizeCode, String sheetNo) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getStringEqualPack(sheetNo, "sheetNo", ddlPackBean);
|
||||
return cimCheryOrderRepository.findByHqlWhere(ddlPackBean);
|
||||
}
|
||||
|
||||
private String getWorkshopName(String organizeCode, String workshopNo) {
|
||||
MesConfig config = configService.getMesConfigNoError(organizeCode, workshopNo);
|
||||
return (null == config || StringUtils.isEmpty(config.getCfgValue())) ? MesPcnExtConstWords.EMPTY : config.getCfgValue();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue