"eladmin-logging/vscode:/vscode.git/clone" did not exist on "9f43851efbd9c1bf67e30f1df4fdd4880e8f4f76"
Commit c004f872 authored by 季圣华's avatar 季圣华
Browse files

优化调拨出库单据的仓库判断

parent 47b5d2d8
...@@ -324,6 +324,9 @@ public class ExceptionConstants { ...@@ -324,6 +324,9 @@ public class ExceptionConstants {
//单据录入-退货单不能欠款 //单据录入-退货单不能欠款
public static final int DEPOT_HEAD_BACK_BILL_DEBT_FAILED_CODE = 8500009; public static final int DEPOT_HEAD_BACK_BILL_DEBT_FAILED_CODE = 8500009;
public static final String DEPOT_HEAD_BACK_BILL_DEBT_FAILED_MSG = "退货单不能欠款"; public static final String DEPOT_HEAD_BACK_BILL_DEBT_FAILED_MSG = "退货单不能欠款";
//单据录入-调入仓库与原仓库不能重复
public static final int DEPOT_HEAD_ANOTHER_DEPOT_EQUAL_FAILED_CODE = 8500010;
public static final String DEPOT_HEAD_ANOTHER_DEPOT_EQUAL_FAILED_MSG = "调入仓库与原仓库不能重复";
/** /**
* 单据明细信息 * 单据明细信息
* type = 90 * type = 90
......
...@@ -368,7 +368,12 @@ public class DepotItemService { ...@@ -368,7 +368,12 @@ public class DepotItemService {
} }
if(BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) { if(BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {
if (StringUtil.isExist(rowObj.get("anotherDepotId"))) { if (StringUtil.isExist(rowObj.get("anotherDepotId"))) {
depotItem.setAnotherDepotId(rowObj.getLong("anotherDepotId")); if(rowObj.getLong("anotherDepotId").equals(rowObj.getLong("depotId"))) {
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ANOTHER_DEPOT_EQUAL_FAILED_CODE,
String.format(ExceptionConstants.DEPOT_HEAD_ANOTHER_DEPOT_EQUAL_FAILED_MSG));
} else {
depotItem.setAnotherDepotId(rowObj.getLong("anotherDepotId"));
}
} else { } else {
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ANOTHER_DEPOT_FAILED_CODE, throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ANOTHER_DEPOT_FAILED_CODE,
String.format(ExceptionConstants.DEPOT_HEAD_ANOTHER_DEPOT_FAILED_MSG)); String.format(ExceptionConstants.DEPOT_HEAD_ANOTHER_DEPOT_FAILED_MSG));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment