Commit d8ca585720eb18dd03c0db8c40e974f9c8ed611e
1 parent
6b8998e3
修改收货是是否收完的判断
Showing
1 changed file
with
4 additions
and
2 deletions
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
... | ... | @@ -292,12 +292,14 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai |
292 | 292 | } |
293 | 293 | if (!"empty".equals(location.getStatus()) ) { |
294 | 294 | throw new ServiceException("库位不是空闲状态!"); |
295 | + } | |
295 | 296 | if (QuantityConstant.TASK_TYPE_WHOLERECEIPT.equals(taskType)) { |
296 | - if (com.huaheng.common.utils.StringUtils.isNotEmpty(location.getContainerCode())) | |
297 | + if (com.huaheng.common.utils.StringUtils.isNotEmpty(location.getContainerCode())) { | |
297 | 298 | throw new ServiceException("库位(" + containerCode + ")有容器(" + location.getContainerCode() + "),不能整盘入库!"); |
299 | + } | |
298 | 300 | } |
299 | 301 | if(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT.equals(taskType)) { |
300 | - if (com.huaheng.common.utils.StringUtils.isEmpty(location.getContainerCode())) | |
302 | + if (com.huaheng.common.utils.StringUtils.isEmpty(location.getContainerCode())){ | |
301 | 303 | throw new ServiceException("库位(" + locationCode + ")没有容器,不能补充入库!"); |
302 | 304 | } else if (!location.getContainerCode().equals(containerCode)) { |
303 | 305 | throw new ServiceException("库位(" + containerCode + ")对应的容器是:" + location.getContainerCode()+ ",请重选库位!"); |
... | ... |