Merge branch 'dev' into feature/dev-0729

# Conflicts:
#	mhd_bms/src/main/resources/bootstrap.yml

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -181,17 +181,9 @@ public class ReservationStockInOrderApplicationService {
      * 新增入库单
      */
     public Boolean insert(ReservationStockInOrderDO stockInOrderDO) {
-//         如果仓库ID为空，从当前登录用户的关联仓库中获取
+        // 仓库为必填项，前端必须选择入库仓库
         if (stockInOrderDO.getWarehouseId() == null) {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            if (loginUser == null) {
-                throw new ServiceException("登录已失效，请重新登录");
-            }
-            AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-            if (associationWarehouseCacheDO == null || associationWarehouseCacheDO.getWarehouseId() == null) {
-                throw new ServiceException("当前用户未配置关联仓库，请先配置仓库");
-            }
-            stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+            throw new ServiceException("请选择入库仓库");
         }
         //设置仓库
         setWarehouseInfo(stockInOrderDO);