41603 生产工单-导入工单时,系统不应该区分产线的大小写

tags/yfai-mes-ext-v1.0
jun 11 months ago
parent 6a0d1eee40
commit 6a837edbb8

@ -26,6 +26,7 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.CaseInsensitiveMap;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -518,7 +519,12 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
String nowDate = TimeTool.getNowTime(true);
//获取产线信息
List<String> workCenterCodeList = mesWorkOrderList.stream().map(MesWorkOrder::getWorkCenterCode).distinct().collect(Collectors.toList());
Map<String, MesWorkCenter> workCenterMap = BeanMapUtilsExt.getBeanMap(mesWorkCenterRDao, "workCenterCode", organizeCode, workCenterCodeList, "产线信息");
List<MesWorkCenter> mesWorkCenterList = BeanMapUtilsExt.getBeanList(mesWorkCenterRDao, "workCenterCode", organizeCode, workCenterCodeList, "产线信息");
//产线导入不区分大小小
Map<String, MesWorkCenter> workCenterMap = new CaseInsensitiveMap();
for (MesWorkCenter workCenter : mesWorkCenterList) {
workCenterMap.put(workCenter.getWorkCenterCode(), workCenter);
}
//获取班次信息
List<MesShift> mesShiftList = getMesShifts(organizeCode, nowDate, workCenterCodeList);
Map<String, List<MesShift>> mesShiftMap = mesShiftList.stream().collect(Collectors.groupingBy(t -> t.getWorkCenterCode() + t.getShiftCode()));
@ -580,6 +586,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
if (Objects.isNull(mesWorkCenter)) {
MesException.throwMesBusiException("产线【%s】不存在", item.getWorkCenterCode());
}
item.setWorkCenterCode(mesWorkCenter.getWorkCenterCode());
item.setErpWorkCenter(mesWorkCenter.getErpWorkCenter());
//获取客户物料信息
MesCustomerPart customerPart = null == mesCustomerPartMap ? null : mesCustomerPartMap.get(item.getPartNo());

Loading…
Cancel
Save