Merge remote-tracking branch 'origin/xuankuang' into xuankuang

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvLotLocIdController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.warewms.ams;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.druid.util.StringUtils;
 import com.google.common.collect.Lists;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
@@ -119,6 +120,7 @@ public class InvLotLocIdController extends BaseController {
     @PostMapping("/moveEmptyPalletOut")
     private AjaxResult handleEmptyPalletOut(@RequestParam String locationId) {
         BaseLocationInfo baseLocationInfo = iBucketLocInvService.allocateLocationInfo();
+        if (ObjectUtil.isNull(baseLocationInfo)) return AjaxResult.error("baseLocationInfo is null");
         return AjaxResult.success(move(buildInvLotLocIdMoveForm(String.valueOf(baseLocationInfo.getId()), locationId)));
     }
 
@@ -126,6 +128,7 @@ public class InvLotLocIdController extends BaseController {
     @PostMapping("/moveEmptyPalletIn")
     private AjaxResult handleEmptyPalletIn(@RequestParam String locationId) {
         BaseLocationInfo baseLocationInfo = iBucketLocInvService.selectLocationInfo();
+        if (ObjectUtil.isNull(baseLocationInfo)) return AjaxResult.error("baseLocationInfo is null");
         return move(buildInvLotLocIdMoveForm(locationId, String.valueOf(baseLocationInfo.getId())));
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/impl/BucketLocInvServiceImpl.java

@@ -50,6 +50,7 @@ public class BucketLocInvServiceImpl implements IBucketLocInvService {
         List<BaseLocationInfo> locationInfoList =
                 baseLocationInfoService.selectLocationInfoList(Constants.EMPTY_PALLET_INV, Constant.PALLET_TYPE,
                         Boolean.TRUE, Constant.STOCK_STATUS.STOCK00.getValue());
+        if (CollectionUtil.isEmpty(locationInfoList)) return null;
         //获得库存表的排序 orderby
         //1，2，3，4，5，6
         List<Long> bucketLocationIdList = iWcsTaskService.getBucketLocationIdList(Constants.EMPTY_PALLET_INV_SORT);
@@ -73,6 +74,7 @@ public class BucketLocInvServiceImpl implements IBucketLocInvService {
         List<BaseLocationInfo> locationInfoList =
                 baseLocationInfoService.selectLocationInfoList(Constants.EMPTY_PALLET_INV, Constant.PALLET_TYPE,
                         Boolean.FALSE, Constant.STOCK_STATUS.STOCK00.getValue());
+        if (CollectionUtil.isEmpty(locationInfoList)) return null;
         //获得库存表的排序 orderby
         //1，2，3，4，5，6
         List<Long> bucketLocationIdList = iWcsTaskService.getBucketLocationIdList(Constants.EMPTY_PALLET_INV_SORT);

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseLocationInfoServiceImpl.java

@@ -533,7 +533,7 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService {
     public List<BaseLocationInfo> selectLocationInfoList(Long zoneId, String bindSku, Boolean isEmpty, String stockStatus) {
         return baseLocationInfoMapper.selectList(Wrappers.<BaseLocationInfo>lambdaQuery()
                 .eq(BaseLocationInfo::getZoneId, zoneId)
-                .eq(BaseLocationInfo::getBindSku, bindSku)
+                .eq(BaseLocationInfo::getUserdefine10, bindSku)
                 .eq(BaseLocationInfo::getIsEmpty, isEmpty? Constants.YES : Constants.NO)
                 .eq(BaseLocationInfo::getStockStatus, stockStatus));
     }