From c86174225a4b0a68d32111bf18ac401ff95d90ea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 24 八月 2023 14:13:53 +0800
Subject: [PATCH] 仓库加入流程字段
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
index 4a32ee9..ce4579e 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.purchase.AllocationStorehouseApplyDto;
-import com.java110.dto.system.CustomBusinessDatabusDto;
+import com.java110.dto.data.DatabusDataDto;
import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.dto.store.StorehouseDto;
import com.java110.dto.oaWorkflow.WorkflowDto;
@@ -89,11 +89,6 @@
if (storehouseDtoList != null && storehouseDtoList.size() > 0) {
storehouseDto1 = storehouseDtoList.get(0);
}
- if (SH_TYPE_GROUP.equals(storehouseDto1.getShType())) {//闆嗗洟浠撳簱
- communityId = "9999";
- } else {//灏忓尯浠撳簱
- communityId = storehouseDto1.getShObjId();
- }
//寮�鍚祦绋�
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId(), communityId), allocationStorehouseApplyDto.getApplyId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
@@ -115,7 +110,7 @@
machineRecordPo.setApplyOrderId(businessKey);
machineRecordPo.setPurchaseUserId(actRuTaskUserId);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_ALLOCATION_STOREHOUSE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
@@ -361,6 +356,7 @@
variables.put("currentUserId", allocationStorehouseApplyDto.getCurrentUserId());
variables.put("flag", "1200".equals(allocationStorehouseApplyDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", allocationStorehouseApplyDto.getStartUserId());
+ variables.put("nextUserId", allocationStorehouseApplyDto.getNextUserId());
taskService.complete(allocationStorehouseApplyDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
@@ -384,7 +380,7 @@
machineRecordPo.setNoticeState(noticeState);
machineRecordPo.setAuditMessage(auditMessage);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_ALLOCATION_STOREHOUSE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
--
Gitblit v1.8.0