Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesCustSoftInfoService;
 import cn.estsh.i3plus.ext.mes.api.base.strategy.IRoundnessStrategy;
 import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesBomService;
 import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesPartSapService;
+import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesWorkOrderService;
 import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
@@ -87,6 +88,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
     @Autowired
     private MesQueueOrderRepository queueOrderRao;
 
+    @Autowired
+    private MesWorkOrderService mesWorkOrderService;
+
     @Override
     public void execute(MesPartProdGroup partProdGroup, List<MesCustSortInfo> sortInfoList, List<MesPartProdGroupDetail> details) {
         try {
@@ -456,7 +460,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
         mesWorkOrderRao.insert(mesWorkOrder);
 
-
+        /**
+         * 插入工单打印队列数据
+         */
+        mesWorkOrderService.doSaveWorkOrderPrintQueue(mesWorkOrder);
         if (!assemblyList.isEmpty()) {
             for (MesWorkOrderAssembly orderAssembly : assemblyList) {
                 orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());