From d8ca585720eb18dd03c0db8c40e974f9c8ed611e Mon Sep 17 00:00:00 2001
From: mahuandong <752432958@qq.com>
Date: Mon, 21 Oct 2019 17:47:12 +0800
Subject: [PATCH] 修改收货是是否收完的判断
---
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
index e303653..cd80fb3 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -292,12 +292,14 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
}
if (!"empty".equals(location.getStatus()) ) {
throw new ServiceException("库位不是空闲状态！");
+ }
if (QuantityConstant.TASK_TYPE_WHOLERECEIPT.equals(taskType)) {
- if (com.huaheng.common.utils.StringUtils.isNotEmpty(location.getContainerCode()))
+ if (com.huaheng.common.utils.StringUtils.isNotEmpty(location.getContainerCode())) {
throw new ServiceException("库位(" + containerCode + ")有容器(" + location.getContainerCode() + ")，不能整盘入库！");
+ }
}
if(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT.equals(taskType)) {
- if (com.huaheng.common.utils.StringUtils.isEmpty(location.getContainerCode()))
+ if (com.huaheng.common.utils.StringUtils.isEmpty(location.getContainerCode())){
throw new ServiceException("库位(" + locationCode + ")没有容器，不能补充入库！");
} else if (!location.getContainerCode().equals(containerCode)) {
throw new ServiceException("库位(" + containerCode + ")对应的容器是：" + location.getContainerCode()+ "，请重选库位！");
--
libgit2 0.22.2