From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 196408c..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())) {//闆嗗洟浠撳簱
@@ -252,10 +250,10 @@
List<String> flowIdList = new ArrayList<String>();
for (WorkflowDto workflowDto1 : workflowDtos) {
if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE.equals(workflowDto1.getFlowType())) {
- throw new IllegalArgumentException("灏忓尯缂栫爜="+workflowDto1.getCommunityId()+"鐨勭墿鍝佽皟鎷ㄦ祦绋嬭繕鏈儴缃�");
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽皟鎷ㄦ祦绋嬭繕鏈儴缃�");
}
if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO.equals(workflowDto1.getFlowType())) {
- throw new IllegalArgumentException("灏忓尯缂栫爜="+workflowDto1.getCommunityId()+"鐨勭墿鍝佽璋冩嫧杩樻湭閮ㄧ讲");
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽璋冩嫧杩樻湭閮ㄧ讲");
}
flowIdList.add(WorkflowDto.DEFAULT_PROCESS + workflowDto1.getFlowId());
}
--
Gitblit v1.8.0