From 09217e3e32b294d2a59b7454d6e157c05ae95a1b Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sun, 26 Jun 2022 20:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E9=A2=84=E9=AA=8C?=
=?UTF-8?q?=E6=94=B6=E7=AD=89bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controller/inout/WareHouseController.java | 10 +++++-----
.../mybatis/mapper/inventory/InvPreInProductDao.xml | 3 ---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 7d22743..88795b1 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -278,11 +278,11 @@ public class WareHouseController {
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
- if (null != orderEntity) {
- if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
- return ResultVOUtils.error(500, "分仓未选择");
- }
- }
+// if (null != orderEntity) {
+// if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
+// return ResultVOUtils.error(500, "分仓未选择");
+// }
+// }
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
return saveOrderWeb(orderEntity);
}
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index 33849f9..813f046 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -96,9 +96,6 @@
AND invWarehouseCode = #{invWarehouseCode}
-
- AND invWarehouseCode is NULL
-