0618

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/service/impl/BizTechnologicalProcessDetailDrawingServiceImpl.java

@@ -611,6 +611,9 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
     }
 
     private void sendMessage(BizTechnologicalProcessDetailDrawing drawing) {
+        BizProduct bizProduct = new BizProduct();
+        bizProduct.setId(drawing.getProduct().getId());
+        BizProduct product = bizProductMapper.getProductById(bizProduct);
         BizProcess bizProcess = new BizProcess();
         bizProcess.setProcessCode(drawing.getProcessCode());
         BizProcess process = bizProcessMapper.getList(bizProcess).get(0);
@@ -631,7 +634,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                 message.setToUserId(v.getUserId());
                 message.setToUserName(v.getUserName());
 //                message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
-                String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
+                String mes = product.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
                 message.setMessage(mes);
                 message.setMessageDate(new Date());
                 messages.add(message);
@@ -640,6 +643,9 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
         bizMessageService.saveBatch(messages);
     }
     private void sendMessageDept(BizTechnologicalProcessDetailDrawing drawing) {
+        BizProduct bizProduct = new BizProduct();
+        bizProduct.setId(drawing.getProduct().getId());
+        BizProduct product = bizProductMapper.getProductById(bizProduct);
         BizProcess bizProcess = new BizProcess();
         bizProcess.setProcessCode(drawing.getProcessCode());
         BizProcess process = bizProcessMapper.getList(bizProcess).get(0);
@@ -660,14 +666,14 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                 message.setToUserId(v.getUserId());
                 message.setToUserName(v.getUserName());
                 if(drawing.getAbandoned() == 1){
-                    String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
+                    String mes = product.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
                     message.setMessage(mes);
                 }else{
                     if(drawing.getPattern().trim().equals("替换产品")){
-                        String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
+                        String mes = product.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
                         message.setMessage(mes);
                     }else{
-                        String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
+                        String mes = product.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
                         message.setMessage(mes);
                     }
                 }