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 -