wms / wms_tianjinggelinmei · Commits

Commit e5960579c5d7798c095f2c387f5efe59e61da2d2

Authored by 易文鹏
1 parent 04a7adc7

用AGV账户库存查看、任务查看默认显示三楼的

Inline Side-by-side
Showing 6 changed files with 42 additions and 14 deletions
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
  View file @e596057
... ... @@ -38,6 +38,7 @@ import javax.annotation.Resource;
38 38 import javax.sql.DataSource;
39 39 import java.math.BigDecimal;
40 40 import java.util.ArrayList;
  41 +import java.util.Arrays;
41 42 import java.util.Date;
42 43 import java.util.List;
43 44 import java.util.stream.Collectors;
... ... @@ -86,6 +87,10 @@ public class LocationController extends BaseController {
86 87 PageDomain pageDomain = TableSupport.buildPageRequest();
87 88 Integer pageNum = pageDomain.getPageNum();
88 89 Integer pageSize = pageDomain.getPageSize();
  90 + String zone=location.getZoneCode();
  91 + if(StringUtils.isEmpty(zone)&&ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
  92 + zone="B";
  93 + }
89 94 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Location::getCreated, createdBegin)
90 95 .lt(StringUtils.isNotEmpty(createdEnd), Location::getCreated, createdEnd)
91 96 .eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
... ... @@ -93,7 +98,7 @@ public class LocationController extends BaseController {
93 98 .eq(StringUtils.isNotEmpty(location.getName()), Location::getName, location.getName())
94 99 .eq(StringUtils.isNotEmpty(location.getContainerCode()), Location::getContainerCode, location.getContainerCode())
95 100 .eq(StringUtils.isNotNull(location.getSystemCreated()), Location::getStatus, location.getStatus())
96   - .eq(StringUtils.isNotEmpty(location.getZoneCode()), Location::getZoneCode, location.getZoneCode())
  101 + .eq(StringUtils.isNotEmpty(zone), Location::getZoneCode, zone)
97 102 .eq(StringUtils.isNotNull(location.getIRow()), Location::getIRow, location.getIRow())
98 103 .eq(StringUtils.isNotNull(location.getIColumn()), Location::getIColumn, location.getIColumn())
99 104 .eq(StringUtils.isNotNull(location.getIGrid()), Location::getIGrid, location.getIGrid())
... ...
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
  View file @e596057
... ... @@ -29,10 +29,7 @@ import org.springframework.ui.ModelMap;
29 29 import org.springframework.web.bind.annotation.*;
30 30  
31 31 import javax.annotation.Resource;
32   -import java.util.ArrayList;
33   -import java.util.HashMap;
34   -import java.util.List;
35   -import java.util.Map;
  32 +import java.util.*;
36 33 import java.util.stream.Collectors;
37 34  
38 35 /**
... ...
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
  View file @e596057
... ... @@ -2,6 +2,7 @@ package com.huaheng.pc.inventory.InventoryMaterialSummary.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.huaheng.common.constant.QuantityConstant;
5 6 import com.huaheng.common.utils.Wrappers;
6 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 8 import com.huaheng.common.utils.StringUtils;
... ... @@ -25,6 +26,7 @@ import org.springframework.ui.ModelMap;
25 26 import org.springframework.web.bind.annotation.*;
26 27  
27 28 import javax.annotation.Resource;
  29 +import java.util.Arrays;
28 30 import java.util.Collections;
29 31 import java.util.List;
30 32  
... ... @@ -69,7 +71,10 @@ public class InventoryMaterialSummaryController extends BaseController {
69 71 public List<InventoryMaterialSummary> list(InventoryMaterialSummary inventoryMaterialSummary, String createdBegin, String createdEnd) {
70 72  
71 73 LambdaQueryWrapper<InventoryMaterialSummary> lambdaQueryWrapper = Wrappers.lambdaQuery();
72   -
  74 + String zone=inventoryMaterialSummary.getZoneCode();
  75 + if(StringUtils.isEmpty(zone)&&ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
  76 + zone="B";
  77 + }
73 78 lambdaQueryWrapper.ge(
74 79 StringUtils.isNotEmpty(createdBegin), InventoryMaterialSummary::getCreated, createdBegin)
75 80 .le(StringUtils.isNotEmpty(createdEnd), InventoryMaterialSummary::getCreated, createdEnd)//创建时间范围
... ... @@ -79,7 +84,7 @@ public class InventoryMaterialSummaryController extends BaseController {
79 84 .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getMaterialCode()), InventoryMaterialSummary::getMaterialCode, inventoryMaterialSummary.getMaterialCode())
80 85 //物料名称
81 86 .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getMaterialName()), InventoryMaterialSummary::getMaterialName, inventoryMaterialSummary.getMaterialName())
82   - .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getZoneCode()), InventoryMaterialSummary::getZoneCode, inventoryMaterialSummary.getZoneCode())
  87 + .eq(StringUtils.isNotEmpty(zone), InventoryMaterialSummary::getZoneCode, zone)
83 88 //货主
84 89 .in(StringUtils.isEmpty(inventoryMaterialSummary.getCompanyCode()),InventoryMaterialSummary::getCompanyCode, ShiroUtils.getCompanyCodeList())
85 90 .eq(!StringUtils.isEmpty(inventoryMaterialSummary.getCompanyCode()),InventoryMaterialSummary::getCompanyCode,inventoryMaterialSummary.getCompanyCode());
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @e596057
... ... @@ -3,6 +3,7 @@ package com.huaheng.pc.inventory.inventoryHeader.controller;
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  6 +import com.huaheng.common.constant.QuantityConstant;
6 7 import com.huaheng.common.exception.service.ServiceException;
7 8 import com.huaheng.common.support.Convert;
8 9 import com.huaheng.common.utils.StringUtils;
... ... @@ -73,10 +74,14 @@ public class InventoryHeaderController extends BaseController
73 74 Integer pageNum = pageDomain.getPageNum();
74 75 Integer pageSize = pageDomain.getPageSize();
75 76  
  77 + String zone=inventoryHeader.getZoneCode();
  78 + if(StringUtils.isEmpty(zone)&&ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
  79 + zone="B";
  80 + }
76 81 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),InventoryHeader::getCreated, createdBegin)
77 82 .le(StringUtils.isNotEmpty(createdEnd), InventoryHeader::getCreated, createdEnd)//创建时间范围
78 83 //.eq(InventoryHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())//仓库
79   - .eq(StringUtils.isNotEmpty(inventoryHeader.getZoneCode()), InventoryHeader::getZoneCode, inventoryHeader.getZoneCode()) //库位
  84 + .eq(StringUtils.isNotEmpty(zone), InventoryHeader::getZoneCode, zone) //库区
80 85 .likeRight(StringUtils.isNotEmpty(inventoryHeader.getLocationCode()),InventoryHeader::getLocationCode,inventoryHeader.getLocationCode()) //库位
81 86 .eq(StringUtils.isNotEmpty(inventoryHeader.getContainerCode()),InventoryHeader::getContainerCode,inventoryHeader.getContainerCode())//容器
82 87 .eq(StringUtils.isNotEmpty(inventoryHeader.getCreatedBy()),InventoryHeader::getCreatedBy,inventoryHeader.getCreatedBy())//创建用户
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @e596057
... ... @@ -35,6 +35,8 @@ import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
35 35 import com.huaheng.pc.config.receiptPreference.mapper.ReceiptPreferenceMapper;
36 36 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
37 37 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
  38 +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
  39 +import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
38 40 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
39 41 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
40 42 import com.huaheng.pc.receipt.receiptContainerHeader.domain.BatteryBean;
... ... @@ -95,6 +97,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
95 97 @Resource
96 98 private WarecellAllocationService warecellAllocationService;
97 99  
  100 + @Resource
  101 + private InventoryHeaderService inventoryHeaderService;
  102 +
98 103 /**
99 104 * 保存入库组盘
100 105 * @param receiptCode 入库单编码
... ... @@ -214,12 +219,20 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
214 219 }
215 220 //3楼agv限制补充入库
216 221 //生成AGV任务
217   - if(ShiroUtils.getUser()!=null&&
218   - Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
  222 + if(ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
219 223 boolean tag=inventoryDetailService.checkInventoryByContainerCode(containerCode);
220 224 if(tag){
221 225 // throw new ServiceException("该托盘已经有库存，限制补充入库");
222 226 }
  227 + }else {
  228 + //判断是否已经在三楼了，避免补充入库
  229 + List<InventoryHeader> list = inventoryHeaderService.list(new LambdaQueryWrapper<InventoryHeader>().eq(InventoryHeader::getContainerCode, containerCode));
  230 + if (!list.isEmpty()) {
  231 + InventoryHeader inventoryHeader = list.get(0);
  232 + if (inventoryHeader.getLocationCode().startsWith("B")) {
  233 + throw new ServiceException("这个托盘已经在三楼使用了！");
  234 + }
  235 + }
223 236 }
224 237 /* 新建保存组盘头表记录*/
225 238 //根据容器编码查询组盘表头记录
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @e596057
... ... @@ -128,16 +128,19 @@ public class TaskHeaderController extends BaseController {
128 128 @PostMapping("/list")
129 129 @ResponseBody
130 130 public TableDataInfo list(TaskHeader taskHeader, @ApiParam(name = "InternalTaskType", value = "类型") Integer InternalTaskType,
131   - @ApiParam(name = "createdBegin", value = "类型") String createdBegin, @ApiParam(name = "createdEnd", value = "类型") String createdEnd
132   - ,Integer taskHeaderStatus) {
  131 + @ApiParam(name = "createdBegin", value = "类型") String createdBegin, @ApiParam(name = "createdEnd", value = "类型") String createdEnd,Integer taskHeaderStatus) {
133 132 LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
134   - lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  133 + String zone=taskHeader.getZoneCode();
  134 + if(StringUtils.isEmpty(zone)&&ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
  135 + zone="B";
  136 + }
  137 + lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
135 138 .eq(StringUtils.isNotNull(InternalTaskType), TaskHeader::getInternalTaskType, InternalTaskType)
136 139 .eq(StringUtils.isNotNull(taskHeader.getId()), TaskHeader::getId, taskHeader.getId())
137 140 .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()), TaskHeader::getContainerCode, taskHeader.getContainerCode())
138 141 .eq(StringUtils.isNotEmpty(taskHeader.getToLocation()), TaskHeader::getToLocation, taskHeader.getToLocation())
139 142 .eq(StringUtils.isNotEmpty(taskHeader.getFromLocation()), TaskHeader::getFromLocation, taskHeader.getFromLocation())
140   - .eq(StringUtils.isNotEmpty(taskHeader.getZoneCode()), TaskHeader::getZoneCode, taskHeader.getZoneCode())
  143 + .eq(StringUtils.isNotEmpty(zone), TaskHeader::getZoneCode,zone)
141 144 .eq(StringUtils.isNotNull(taskHeader.getPriority()), TaskHeader::getPriority, taskHeader.getPriority())
142 145 .eq(StringUtils.isNotNull(taskHeader.getPush()), TaskHeader::getPush, taskHeader.getPush())
143 146 .eq(StringUtils.isNotNull(taskHeader.getStatus()), TaskHeader::getStatus, taskHeader.getStatus())
... ...