From c71507499acb076b7b134c6df95c44655a4d7fca Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 07 九月 2021 11:49:18 +0800
Subject: [PATCH] 1、调整小区仓库调拨记录流程2、调整物品发放流程3、新增优惠申请核验记录4、新增组合支付（未完成，待续）5、优化费用显示问题
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 47fe8b6..4e6ed20 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,8 +3,11 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.allocationStorehouseApply.AllocationStorehouseApplyDto;
+import com.java110.dto.area.AreaDto;
import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.storehouse.StorehouseDto;
+import com.java110.dto.userLogin.UserLoginDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IAllocationStorehouseUserInnerServiceSMO;
@@ -12,6 +15,8 @@
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.intf.store.IAllocationStorehouseApplyInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+import com.java110.intf.store.IStorehouseInnerServiceSMO;
+import com.java110.intf.user.IUserLoginInnerServiceSMO;
import com.java110.po.machine.MachineRecordPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;
@@ -38,6 +43,8 @@
import java.util.List;
import java.util.Map;
+import static com.java110.dto.storehouse.StorehouseDto.SH_TYPE_GROUP;
+
//@Service("resourceEntryStoreSMOImpl")
@RestController
public class AllocationStorehouseUserInnerServiceSMOImpl extends BaseServiceSMO implements IAllocationStorehouseUserInnerServiceSMO {
@@ -60,6 +67,10 @@
@Autowired
private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+ @Autowired
+ private IStorehouseInnerServiceSMO iStorehouseInnerServiceSMO;
+
+
/**
* 鍚姩娴佺▼
*
@@ -71,8 +82,22 @@
variables.put("allocationStorehouseApplyDto", allocationStorehouseApplyDto);
variables.put("userId", allocationStorehouseApplyDto.getCurrentUserId());
variables.put("startUserId", allocationStorehouseApplyDto.getCurrentUserId());
+ //鏌ヨ璋冩嫧婧愪粨搴撴槸闆嗗洟浠撳簱杩樻槸灏忓尯浠撳簱锛屽皬鍖轰粨搴撹蛋琚皟鎷ㄦ祦绋嬪鎵�
+ StorehouseDto storehouseDto = new StorehouseDto();
+ storehouseDto.setShId(allocationStorehouseApplyDto.getShId());
+ List<StorehouseDto> storehouseDtoList = iStorehouseInnerServiceSMO.queryStorehouses(storehouseDto);
+ StorehouseDto storehouseDto1 = new StorehouseDto();
+ String communityId = null;
+ if (storehouseDtoList != null && storehouseDtoList.size() == 1) {
+ storehouseDto1 = storehouseDtoList.get(0);
+ }
+ if (SH_TYPE_GROUP.equals(storehouseDto1.getShType())) {//闆嗗洟浠撳簱
+ communityId = "9999";
+ } else {//灏忓尯浠撳簱
+ communityId = storehouseDto1.getShObjId();
+ }
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId()), allocationStorehouseApplyDto.getApplyId(), variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId(), communityId), allocationStorehouseApplyDto.getApplyId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
@@ -107,7 +132,9 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ List<String> workflowlist = getWorkflowDto1(user.getStoreId());
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKeyIn(workflowlist);
+// TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(), user.getCommunityId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -119,7 +146,7 @@
*/
public List<AllocationStorehouseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()));
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
List<Task> list = null;
@@ -190,21 +217,46 @@
return true;
}
-
- private String getWorkflowDto(String storeId) {
+ private String getWorkflowDto(String storeId, String communityId) {
//寮�鍚祦绋�
//WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
WorkflowDto workflowDto = new WorkflowDto();
- workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE);
+ if (!StringUtil.isEmpty(communityId) && "9999".equals(communityId)) {
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE);
+ } else {
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO);
+ }
workflowDto.setStoreId(storeId);
+ workflowDto.setCommunityId(communityId);
List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
- Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鎶曡瘔寤鸿娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
-
+ Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 璋冩嫧娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {
- throw new IllegalArgumentException("鍚堝悓璧疯崏缁娴佺▼杩樻湭閮ㄧ讲");
+ throw new IllegalArgumentException("璋冩嫧娴佺▼娴佺▼杩樻湭閮ㄧ讲");
}
return WorkflowDto.DEFAULT_PROCESS + tmpWorkflowDto.getFlowId();
+ }
+
+ private List<String> getWorkflowDto1(String storeId) {
+
+ //寮�鍚祦绋�
+ //WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
+ WorkflowDto workflowDto = new WorkflowDto();
+ String[] flowTypes = new String[]{WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE, WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO};
+ workflowDto.setFlowTypes(flowTypes);
+ workflowDto.setStoreId(storeId);
+ List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
+ if (workflowDtos != null && workflowDtos.size() == 0) {
+ throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼!");
+ }
+ List<String> flowIdList = new ArrayList<String>();
+ for (WorkflowDto workflowDto1 : workflowDtos) {
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey())) {
+ throw new IllegalArgumentException("璋冩嫧娴佺▼娴佺▼杩樻湭閮ㄧ讲");
+ }
+ flowIdList.add(WorkflowDto.DEFAULT_PROCESS + workflowDto1.getFlowId());
+ }
+ return flowIdList;
}
/**
@@ -220,7 +272,7 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()))
.taskAssignee(user.getUserId())
.finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -242,7 +294,7 @@
HistoryService historyService = processEngine.getHistoryService();
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()))
.taskAssignee(user.getUserId())
.finished();
// if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
--
Gitblit v1.8.0