diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java index 0ffb955..abe6f28 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java @@ -3,9 +3,13 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping.st import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesPartPackageTypeService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesPartShippingGroupService; 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.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesPartPackageType; import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup; @@ -70,12 +74,19 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat @Override public ResultBean execute(MesShippingOrderManagement bean, List shippingOrderManagementList) { List modelList = new ArrayList<>(); - for (MesShippingOrderManagement loadingList : shippingOrderManagementList) { - ChengDuVolvoShippingPrintModel model = getPrintData(loadingList); + for (MesShippingOrderManagement shippingOrder : shippingOrderManagementList) { + ChengDuVolvoShippingPrintModel model = getPrintData(shippingOrder); if (model != null) { + model.setShippingCode(shippingOrder.getShippingCode()); + shippingOrder.setPrintCount(StringUtil.isEmpty(shippingOrder.getPrintCount()) ? MesPcnExtConstWords.ONE : shippingOrder.getPrintCount() + MesPcnExtConstWords.ONE); + shippingOrder.setLastPrintTime(TimeTool.getNowTime(true)); + shippingOrder.setLastPrintUser(bean.getUserInfo()); + ConvertBean.serviceModelUpdate(shippingOrder, bean.getUserInfo()); + modelList.add(model); } } + saveShippingOrderManagementList(shippingOrderManagementList); return ResultBean.success("装车单打印成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(modelList); }