Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

# Conflicts:
#	winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseReceiptReportServiceImpl.java

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseReceiptReportServiceImpl.java

@@ -117,13 +117,14 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
      */
     @Override
     public String editProcurementReceiptReport(PurchaseReceiptReport purchaseReceiptReport) {
+        PurchaseReceiptReport purchaseReceiptReport1=this.selectById(purchaseReceiptReport.getId());
         boolean one = this.updateById(purchaseReceiptReport);
-        if (purchaseReceiptReport.getStatusFlag().equals(StatusEnum.TASK_RETURN.getFlag())) {
-            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
+        if(purchaseReceiptReport.getStatusFlag().equals(StatusEnum.TASK_RETURN.getFlag())){
+            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport1.getWorkflowId());
             // 不是退回的单子
             if (isStartWorkflow) {
                 Workflow workflow = workflowService
-                        .findLatestWorkflowByBusinessCodeByApp(purchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                        .findLatestWorkflowByBusinessCodeByApp(purchaseReceiptReport1.getCompId(),"PROCUREMENT-RECEIPT-REPORT");
                 // 没配置审核流程，直接结束并处理信息
                 if (workflow == null) {
                     throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -132,16 +133,16 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
                 else {
 
                     // 设置状态 已提交审核
-                    purchaseReceiptReport.setWorkflowId(workflow.getId());
-                    this.updateById(purchaseReceiptReport);
-                    workflowService.startInstance(workflow.getId(), purchaseReceiptReport.getId());
+                    purchaseReceiptReport1.setWorkflowId(workflow.getId());
+                    this.updateById(purchaseReceiptReport1);
+                    workflowService.startInstance(workflow.getId(), purchaseReceiptReport1.getId());
                 }
             }
             // 退回的单子 再启用
             else {
 
-                this.updateById(purchaseReceiptReport);
-                workflowService.activateInstance(purchaseReceiptReport.getWorkflowId(), purchaseReceiptReport.getId());
+                this.updateById(purchaseReceiptReport1);
+                workflowService.activateInstance(purchaseReceiptReport1.getWorkflowId(), purchaseReceiptReport1.getId());
             }
         }
         if (one) {