Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev

# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java

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,9 +74,15 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat
     @Override
     public ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> shippingOrderManagementList) {
         List<ChengDuVolvoShippingPrintModel> 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);
             }
         }