add:增加组盘扫描入库校验

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java

@@ -8,16 +8,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.domain.exception.handler.ApiError;
 import org.nl.common.enums.StatusEnum;
-import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.*;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.MapOf;
-import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
 import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
 import org.nl.wms.dispatch_manage.point.service.ISchBasePointService;
@@ -33,6 +31,8 @@ import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
 import org.nl.wms.pda_manage.devicemanage.dto.ComTp;
 import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService;
 import org.nl.wms.pda_manage.palletio.service.dto.LabelValueVo;
+import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
+import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -67,7 +67,8 @@ public class DeviceManageController {
     private IMdPbVehicleMaterService iMdPbVehicleMaterService;
     @Autowired
     private TranforTask tranforTask;
-
+    @Autowired
+    private IStIvtStructattrService iStIvtStructattrService;
     /**
      * 切换出入库模式
      * @param form
@@ -132,7 +133,17 @@ public class DeviceManageController {
                 throw new BadRequestException(String.format(vehicleCode+"组盘异常,确认是否出库后组盘"));
             }
         }
-
+        //校验料箱是否还存在库存
+        RedissonUtils.lock(() -> {
+            QueryWrapper<StIvtStructattr> query = new QueryWrapper<StIvtStructattr>()
+                    .eq("is_used", true)
+                    .eq("lock_type", StatusEnum.LOCK.code("无锁"))
+                    .eq("vehicle_code", vehicleCode);
+            List<StIvtStructattr> list = iStIvtStructattrService.list(query);
+            if (ObjectUtils.isNotEmpty(list)) {
+                throw new BadRequestException(String.format("扫码失败：当前载具号在立库的库位中未出库:%s中，请核查库存记录!", list.get(0).getStruct_code()));
+            }
+        }, StatusEnum.STRATEGY_TYPE.code("入库") + vehicleCode, 5);
         wmsToAcsService.toCommand(device_code,"1",vehicleInfo.getH());
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java

@@ -73,7 +73,7 @@ public class IOStorageController {
                         .eq("vehicle_code", vehicle_code);
                 List<StIvtStructattr> list = iStIvtStructattrService.list(query);
                 if (ObjectUtils.isNotEmpty(list)) {
-                    throw new BadRequestException(String.format("出库确认失败：当前载具号在立库的库位:%s中，请检查!", list.get(0).getStruct_code()));
+                    throw new BadRequestException(String.format("出库确认失败：当前载具号在立库的库位中未出库:%s中，请核查库存记录!", list.get(0).getStruct_code()));
                 }
             }, StatusEnum.STRATEGY_TYPE.code("出库") + vehicle_code, 5);
             //流程校验

wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue

@@ -13,7 +13,8 @@
         >
           <el-form-item label="载具号">
             <el-input
-              v-model="query.vehicle_code"
+              v-model="
+                query.vehicle_code"
               clearable
               placeholder="载具号"
               style="width: 200px;"