From ea55110f0bd2a4f1d4ac1cc174d28b716111ca34 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 24 十月 2022 17:21:58 +0800
Subject: [PATCH] 优化 代码
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 4e6ed20..a1a380e 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,11 +3,9 @@
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;
@@ -16,7 +14,6 @@
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;
@@ -82,13 +79,14 @@
variables.put("allocationStorehouseApplyDto", allocationStorehouseApplyDto);
variables.put("userId", allocationStorehouseApplyDto.getCurrentUserId());
variables.put("startUserId", allocationStorehouseApplyDto.getCurrentUserId());
+ variables.put("nextUserId", allocationStorehouseApplyDto.getNextUserId());
//鏌ヨ璋冩嫧婧愪粨搴撴槸闆嗗洟浠撳簱杩樻槸灏忓尯浠撳簱锛屽皬鍖轰粨搴撹蛋琚皟鎷ㄦ祦绋嬪鎵�
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) {
+ if (storehouseDtoList != null && storehouseDtoList.size() > 0) {
storehouseDto1 = storehouseDtoList.get(0);
}
if (SH_TYPE_GROUP.equals(storehouseDto1.getShType())) {//闆嗗洟浠撳簱
@@ -247,12 +245,15 @@
workflowDto.setStoreId(storeId);
List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
if (workflowDtos != null && workflowDtos.size() == 0) {
- throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼!");
+ throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼锛岃鍦ㄧ墿涓氳处鍙风郴缁熺鐞嗕笅娴佺▼绠＄悊涓厤缃祦绋�!");
}
List<String> flowIdList = new ArrayList<String>();
for (WorkflowDto workflowDto1 : workflowDtos) {
- if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey())) {
- throw new IllegalArgumentException("璋冩嫧娴佺▼娴佺▼杩樻湭閮ㄧ讲");
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽皟鎷ㄦ祦绋嬭繕鏈儴缃�");
+ }
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽璋冩嫧杩樻湭閮ㄧ讲");
}
flowIdList.add(WorkflowDto.DEFAULT_PROCESS + workflowDto1.getFlowId());
}
--
Gitblit v1.8.0