jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'refs/remotes/origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod

Browse Source 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPartShippingGroupService.java
uat-temp-nht-2503100000-45560
logic.fang 2 months ago
parent 486ed45033 2592f341fe
commit ca85a6f637
3 changed files with 187 additions and 66 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesPartShippingGroupService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
import cn.estsh.i3plus.pojo.mes.model.MesShippingOrderManagementModel;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.ApiOperation;
import java.util.List;
@ -24,7 +25,7 @@ public interface IMesPartShippingGroupService {
MesPartShippingGroup getMesPartShippingGroup(String organizeCode, String shippingGroupCode);
@ApiOperation(value = "打印发运单数据")
List<MesShippingOrderManagementModel> doMesMesShippingOrderManagementPrint(MesShippingOrderManagement model);
ResultBean doMesMesShippingOrderManagementPrint(MesShippingOrderManagement model);
@ApiOperation(value = "发运组明细")
MesPartShippingGroupDetail getMesPartShippingGroupDetail(String organizeCode, String shippingGroupCode, String partNo, String custPartNo);

5
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesPartShippingGroupController.java
Unescape Escape View File

@ -54,10 +54,7 @@ public class MesPartShippingGroupController {
try {
// 数据校验
ValidatorBean.checkNotNull(model.getShippingGroupCode(), "发运组代码不能为空");
List<MesShippingOrderManagementModel> shippingOrderManagementList = shippingGroupService.doMesMesShippingOrderManagementPrint(model);
return ResultBean.success("发运单打印成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(shippingOrderManagementList);
return shippingGroupService.doMesMesShippingOrderManagementPrint(model);
} catch (ImppBusiException e) {
return ResultBean.fail(e).build();
} catch (Exception e) {

245
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPartShippingGroupService.java
Unescape Escape View File

@ -6,24 +6,33 @@ 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.MesCustomerPart;
import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
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.MesShippingOrderManagementDetailModelForLiJia;
import cn.estsh.i3plus.pojo.mes.model.MesShippingOrderManagementModel;
import cn.estsh.i3plus.pojo.mes.model.MesShippingOrderManagementModelForLiJia;
import cn.estsh.i3plus.pojo.mes.repository.*;
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.function.Function;
import java.util.logging.Handler;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@Service
@Slf4j
@ -64,7 +73,7 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
}
@Override
public List<MesShippingOrderManagementModel> doMesMesShippingOrderManagementPrint(MesShippingOrderManagement bean) {
public ResultBean doMesMesShippingOrderManagementPrint(MesShippingOrderManagement bean) {
DdlPackBean configPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getStringEqualPack("WU_HU_SUPPLIER","cfgKey", configPackBean);
List<MesConfig> configList = mesConfigRao.findByHqlWhere(configPackBean);
@ -72,82 +81,142 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
if (configList != null && !configList.isEmpty()) {
supplierNo = configList.get(0).getCfgValue();
}
List<MesShippingOrderManagementModel> modelList = new ArrayList<>();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
//多选
if (!StringUtil.isEmpty(bean.getShippingGroupCode())) {
DdlPreparedPack.getInPackList(Arrays.asList(bean.getShippingGroupCode().split(",")), "shippingGroupCode", packBean);
}
DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", packBean);
DdlPreparedPack.getIsNull("lastPrintTime", packBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"createDatetime"}, packBean);
List<MesShippingOrderManagement> pullingOrderInfos = shippingOrderManagementRepository.findByHqlTopWhere(packBean,10);
log.info("doMesMesShippingOrderManagementPrint-pullingOrderInfos" + pullingOrderInfos.size());
if (!CollectionUtils.isEmpty(pullingOrderInfos)) {
//把查出来的发运单打印并修改打印状态为已打印
for (MesShippingOrderManagement shippingOrder : pullingOrderInfos) {
MesShippingOrderManagementModel model = new MesShippingOrderManagementModel();
String shippingCodePrefix = shippingOrder.getShippingCode().substring(0, shippingOrder.getShippingCode().length() - 3);
String shippingCodeSuffix = shippingOrder.getShippingCode().substring(shippingOrder.getShippingCode().length() - 3);
model.setShippingCode(shippingCodePrefix);
model.setShippingCodeAfter3(shippingCodeSuffix);
model.setShippingCodeWhole(shippingOrder.getShippingCode());
//查询原始报文
List<MesCimCheryOrder> cheryOrderList = getCheryOrder(shippingOrder.getOrganizeCode(), shippingOrder.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));
}
//45527 礼嘉福特发运单打印（通过系统参数信息判断是否采用新的查询取值逻辑-礼嘉福特）
DdlPackBean configPackBeanTwo = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getStringEqualPack("SORT_SHIPMENT_PRINTS_FLAG_FOR_LI_JIA","cfgKey", configPackBeanTwo);
MesConfig liJiaConfig = mesConfigRao.getByProperty(configPackBeanTwo);
log.info("doMesMesShippingOrderManagementPrint-liJiaConfig" + liJiaConfig);
if (Objects.isNull(liJiaConfig)) {
log.info("doMesMesShippingOrderManagementPrint-老逻辑");
//未维护该参数，则继续执行原有逻辑
List<MesShippingOrderManagementModel> modelList = new ArrayList<>();
//把查出来的发运单打印并修改打印状态为已打印-
for (MesShippingOrderManagement shippingOrder : pullingOrderInfos) {
MesShippingOrderManagementModel model = new MesShippingOrderManagementModel();
String shippingCodePrefix = shippingOrder.getShippingCode().substring(0, shippingOrder.getShippingCode().length() - 3);
String shippingCodeSuffix = shippingOrder.getShippingCode().substring(shippingOrder.getShippingCode().length() - 3);
model.setShippingCode(shippingCodePrefix);
model.setShippingCodeAfter3(shippingCodeSuffix);
model.setShippingCodeWhole(shippingOrder.getShippingCode());
//查询原始报文
List<MesCimCheryOrder> cheryOrderList = getCheryOrder(shippingOrder.getOrganizeCode(), shippingOrder.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));
}
//查询发运单明细
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(shippingOrder.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(shippingOrder.getId(), "pid", partPackBean);
DdlPreparedPack.getOrderBy("boxNum",CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), partPackBean);
List<MesShippingOrderManagementDetail> shipOrderPartInfos = shippingOrderManagementDetailRepository.findByHqlWhere(partPackBean);
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());
//查询发运单明细
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(shippingOrder.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(shippingOrder.getId(), "pid", partPackBean);
DdlPreparedPack.getOrderBy("boxNum",CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), partPackBean);
List<MesShippingOrderManagementDetail> shipOrderPartInfos = shippingOrderManagementDetailRepository.findByHqlWhere(partPackBean);
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);
}
detailList.add(detailModel);
model.setShipOrderPartInfos(detailList);
}
model.setShipOrderPartInfos(detailList);
}
//查询原有报文 根据shippingCode;
shippingOrder.setPrintCount(StringUtil.isEmpty(shippingOrder.getPrintCount())?1:shippingOrder.getPrintCount()+1);
shippingOrder.setLastPrintTime(TimeTool.getNowTime(true));
shippingOrder.setLastPrintUser(bean.getUserInfo());
ConvertBean.serviceModelUpdate(shippingOrder, bean.getUserInfo());
modelList.add(model);
//查询原有报文 根据shippingCode;
shippingOrder.setPrintCount(StringUtil.isEmpty(shippingOrder.getPrintCount())?1:shippingOrder.getPrintCount()+1);
shippingOrder.setLastPrintTime(TimeTool.getNowTime(true));
shippingOrder.setLastPrintUser(bean.getUserInfo());
ConvertBean.serviceModelUpdate(shippingOrder, bean.getUserInfo());
modelList.add(model);
}
shippingOrderManagementRepository.saveAll(pullingOrderInfos);
return ResultBean.success("发运单打印成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(modelList);
}else {
log.info("doMesMesShippingOrderManagementPrint-新逻辑");
//维护了该参数，则执行礼嘉的新逻辑
List<MesShippingOrderManagementModelForLiJia> mainDataList = new ArrayList<>();
/**
* 查询发运单明细信息
*/
List<Long> pidList = pullingOrderInfos.stream().map(MesShippingOrderManagement::getId).collect(Collectors.toList());
DdlPackBean liJIaPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getInPackList(pidList, "pid", liJIaPackBean);
List<MesShippingOrderManagementDetail> shippingOrderManagementDetailList =
shippingOrderManagementDetailRepository.findByHqlWhere(liJIaPackBean);
log.info("doMesMesShippingOrderManagementPrint-查询发运单明细信息" + shippingOrderManagementDetailList.size());
Map<Long, List<MesShippingOrderManagementDetail>> detailByPidMap = shippingOrderManagementDetailList
.stream().collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getPid));
log.info("doMesMesShippingOrderManagementPrint-查询发运单明细信息-detailByPidMap-" + detailByPidMap.size());
//遍历处理每个发运单主表
for (MesShippingOrderManagement pullingOrderInfo : pullingOrderInfos) {
//一张实体发运单包含三部分信息（顶部的通用数据、中部的第一份表格数据，底部的第二份表格数据）
//取出当前发运单的明细信息
List<MesShippingOrderManagementDetail> details = detailByPidMap.get(pullingOrderInfo.getId());
if (!CollectionUtils.isEmpty(details)) {
//将发运单明细按照 assyCode 分组
//assyCode 的个数 / 2 代表会生成实体发运单的份数（一个 assyCode 就是一个表格，一份实体表单上可以放两个表格）
Map<String, List<MesShippingOrderManagementDetail>> detailByAssyCodeMap =
details.stream().collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getAssyCode));
List<String> assyCodeList = new ArrayList<>(detailByAssyCodeMap.keySet());
//将 assyCode 两两分组
List<List<String>> physicalOrderList = IntStream.range(0, assyCodeList.size())
.filter(i -> i % 2 == 0)
.mapToObj(i -> assyCodeList.subList(i, Math.min(i + 2, assyCodeList.size())))
.collect(Collectors.toList());
for (List<String> list : physicalOrderList) {
//生成一张实体发运单
log.info("doMesMesShippingOrderManagementPrint-生成一张实体发运单-list-" + list);
mainDataList.add(createPhysicalOrder(pullingOrderInfo, list, detailByAssyCodeMap, details));
}
}
pullingOrderInfo.setPrintCount(StringUtil.isEmpty(pullingOrderInfo.getPrintCount())? 1 : pullingOrderInfo.getPrintCount()+1);
pullingOrderInfo.setLastPrintTime(TimeTool.getNowTime(true));
pullingOrderInfo.setLastPrintUser(bean.getUserInfo());
ConvertBean.serviceModelUpdate(pullingOrderInfo, bean.getUserInfo());
log.info("doMesMesShippingOrderManagementPrint-pullingOrderInfo更新");
}
shippingOrderManagementRepository.saveAll(pullingOrderInfos);
log.info("doMesMesShippingOrderManagementPrint-结束");
return ResultBean.success("发运单打印成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(mainDataList);
}
shippingOrderManagementRepository.saveAll(pullingOrderInfos);
}
// return pullingOrderInfos;
return modelList;
return ResultBean.success("不存在需要打印的发运单")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
private String getWorkshopName(String organizeCode, String workshopNo) {
@ -181,4 +250,58 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
DdlPreparedPack.getStringEqualPack(partNo, "partNo", packBean);
return mesPartShippingGroupDetailRepository.getByProperty(packBean);
}
private MesShippingOrderManagementModelForLiJia createPhysicalOrder(MesShippingOrderManagement pullingOrderInfo,
List<String> assyCodeList,
Map<String, List<MesShippingOrderManagementDetail>> detailByAssyCodeMap,
List<MesShippingOrderManagementDetail> details) {
MesShippingOrderManagementModelForLiJia model = new MesShippingOrderManagementModelForLiJia();
//顶部的通用数据赋值
model.setShippingGroupName(pullingOrderInfo.getShippingGroupName());
model.setPrintDateTime(TimeTool.getNowTime(true));
model.setShippingCode(pullingOrderInfo.getShippingCode());
model.setDocumentNumber("YFVCQ-MS06-02-01");
log.info("doMesMesShippingOrderManagementPrint-顶部的通用数据赋值" + model);
//中部表结构赋值
model.setDetailModelsOne(createDetailList(assyCodeList.get(0), detailByAssyCodeMap, details, pullingOrderInfo.getRackNo()));
log.info("doMesMesShippingOrderManagementPrint-中部表结构赋值" + model);
//底部表结构赋值
model.setDetailModelsTwo(createDetailList(assyCodeList.get(1), detailByAssyCodeMap, details, pullingOrderInfo.getRackNo()));
log.info("doMesMesShippingOrderManagementPrint-底部表结构赋值" + model);
return model;
}
private List<MesShippingOrderManagementDetailModelForLiJia> createDetailList(
String assyCode, Map<String, List<MesShippingOrderManagementDetail>> detailByAssyCodeMap,
List<MesShippingOrderManagementDetail> details, String rackNo) {
List<MesShippingOrderManagementDetailModelForLiJia> dataList = new ArrayList<>();
//取出符合条件的发运单明细数据
List<MesShippingOrderManagementDetail> nowDetailList = detailByAssyCodeMap.get(assyCode);
log.info("doMesMesShippingOrderManagementPrint-createDetailList-nowDetailList" + nowDetailList.size());
if (!CollectionUtils.isEmpty(nowDetailList)) {
//并按照 logic_seq 升序排列
List<MesShippingOrderManagementDetail> collect = nowDetailList.stream().sorted(
Comparator.comparing(MesShippingOrderManagementDetail::getLogicSeq)).collect(Collectors.toList());
Integer number = 1;
for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : collect) {
MesShippingOrderManagementDetailModelForLiJia detailModel = new MesShippingOrderManagementDetailModelForLiJia();
detailModel.setNumber(number);
detailModel.setCustInfoSeq(mesShippingOrderManagementDetail.getCustInfoSeq());
if (!StringUtils.isEmpty(mesShippingOrderManagementDetail.getVin())) {
detailModel.setVin(mesShippingOrderManagementDetail.getVin().substring(
mesShippingOrderManagementDetail.getVin().length() - 6));
}
detailModel.setCarSerialCode(mesShippingOrderManagementDetail.getCarSerialCode());
detailModel.setPartNo(mesShippingOrderManagementDetail.getPartNo());
detailModel.setCustPartNo(mesShippingOrderManagementDetail.getCustPartNo());
detailModel.setCustPartName(mesShippingOrderManagementDetail.getPartName());
detailModel.setRackNo(rackNo);
dataList.add(detailModel);
number ++;
}
}
log.info("doMesMesShippingOrderManagementPrint-createDetailList-dataList" + dataList.size());
return dataList;
}
}

Write Preview
Loading…
Cancel
Save