装配目视单打印

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

@@ -245,7 +245,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
 
         updateMesWorkOrder(result,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.UPDATE,0);
-        if (isSavePrintQueue) insertPrintQueue(result, null);
+        if (isSavePrintQueue) insertPrintQueue(result);
 
         return result;
     }
@@ -456,32 +456,22 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             }
 
             // 创建工单打印队列
-            insertPrintQueue(item, mesPartProdGroup);
+            insertPrintQueue(item);
 
         } else {
             item.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue());
         }
     }
 
-    private MesPrintQueue insertPrintQueue(MesWorkOrder workOrder, MesPartProdGroup mesPartProdGroup) {
+    private MesPrintQueue insertPrintQueue(MesWorkOrder workOrder) {
 
         if (workOrder.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) return null;
 
         if (workOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) return null;
 
-        if (mesPartProdGroup == null) {
-            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(workOrder.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(workOrder.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean);
-            mesPartProdGroup = mesPartProdGroupRDao.getByProperty(ddlPackBean);
-            if(Objects.isNull(mesPartProdGroup)){
-                MesException.throwMesBusiException("生产线组【%s】信息不存在",workOrder.getPartProdGroupCode());
-            }
-        }
-
         MesPrintQueue printQueue = new MesPrintQueue();
         BeanUtils.copyProperties(workOrder, printQueue, MesExtConstWords.ID);
         printQueue.setPrintQueueType(MesExtEnumUtil.PRINT_QUEUE_TYPE.WORK_ORDER_ASSEMBLY.getValue());
-        printQueue.setPartProdGroupCode(mesPartProdGroup.getPartProdGroupCode());
         printQueue.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
         return printQueueRepository.save(printQueue);
     }
@@ -620,7 +610,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 mesWorkOrderLogList.add(workOrderLog);
 
                 // 如果工单为发布状态则新增打印队列
-                insertPrintQueue(copyMesWorkOrder, null);
+                insertPrintQueue(copyMesWorkOrder);
 
                 continue;
             } else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) {
@@ -1193,7 +1183,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             return;
         }
 
-        insertPrintQueue(workOrder, null);
+        insertPrintQueue(workOrder);
 
     }