opt:优化

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java

@@ -66,7 +66,11 @@ public class PdaIosInController {
     public ResponseEntity<Object> getSect(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(pdaIosInService.getSect(whereJson), HttpStatus.OK);
     }
-
+    @PostMapping("/getFloor")
+    @Log("获取楼层")
+    public ResponseEntity<Object> getFloor(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaIosInService.getFloor(whereJson), HttpStatus.OK);
+    }
 
     @PostMapping("/getRegion")
     @Log("获取区域")

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java

@@ -84,6 +84,8 @@ public interface PdaIosInService {
      */
     List<SelectItemVo> getSect(JSONObject whereJson);
 
+    List<SelectItemVo> getFloor(JSONObject whereJson);
+
 
     /**
      * 查询区域

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java

@@ -51,7 +51,8 @@ public interface PdaIosOutService {
      *
      * @param whereJson {
      *                  storagevehicle_code： 载具码
-     *                  point_code： 点位编码
+     *                  point_code： 点位编码,
+     *                  floor_code: 楼层
      *                  }
      * @return PdaResponse
      */

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java

@@ -32,6 +32,8 @@ import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.SchBaseRegion;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.tasks.BackInTask;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper;
 import org.nl.wms.warehouse_manage.enums.IOSConstant;
 import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
@@ -61,9 +63,8 @@ import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS;
  */
 @Service
 public class PdaIosInServiceImpl implements PdaIosInService {
-
+    @Resource
-    @Autowired
+    private SysDictMapper sysDictMapper;
-    private Map<String, AbstractTask> applyTaskMap;
     /**
      * 组盘记录mapper
      */
@@ -89,12 +90,6 @@ public class PdaIosInServiceImpl implements PdaIosInService {
     @Autowired
     private IMdPbMeasureunitService iMdPbMeasureunitService;
 
-    /**
-     * 载具服务
-     */
-    @Autowired
-    private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService;
-
     /**
      * 库区服务
      */
@@ -233,6 +228,18 @@ public class PdaIosInServiceImpl implements PdaIosInService {
         );
         return selectList;
     }
+    @Override
+    public List<SelectItemVo> getFloor(JSONObject whereJson) {
+
+        List<Dict> dictList = sysDictMapper.selectList(new LambdaQueryWrapper<Dict>().eq(Dict::getCode, "floor_code")
+                .isNotNull(Dict::getLabel)
+                .ne(Dict::getLabel, ""));
+        List<SelectItemVo> selectList = new ArrayList<>();
+        dictList.forEach(r ->
+                selectList.add(SelectItemVo.builder().text(r.getLabel()).value(r.getValue()).build())
+        );
+        return selectList;
+    }
 
     @Override
     public PdaResponse getRegion(JSONObject whereJson) {

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java

@@ -133,6 +133,8 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
         if (ObjectUtil.isEmpty(outPoint)) {
             throw new BadRequestException("点位不能为空!");
         }
+        String floor_code = param.getString("floor_code");
+
         //校验点位是否存在
         SchBasePoint schBasePoint = iSchBasePointService
                 .getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, outPoint));
@@ -183,6 +185,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
         ioStorInvDisMapper.update(new IOStorInvDis(), new LambdaUpdateWrapper<IOStorInvDis>()
                 .set(IOStorInvDis::getTask_id, taskId)
                 .set(IOStorInvDis::getPoint_code,outPoint)
+                .set(IOStorInvDis::getFloor_code,floor_code)
                 .eq(IOStorInvDis::getIostorinvdis_id, disId)
         );
         //更新组盘记录表