opt:空架缓存区改成只放空架，

增加点位生产拆包区 FHW01-09-01,991 废包材处理区 FBC02,1005
2024-12-03 16:33:25 +08:00
parent 3fa179a023
commit c58cd0aede
6 changed files with 51 additions and 21 deletions
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
@@ -9,9 +9,9 @@ import org.nl.common.utils.RedisUtils;
 import org.nl.wms.board.service.BoardService;
 import org.nl.wms.board.service.dao.dto.*;
 import org.nl.wms.board.service.dao.mapper.BoardMapper;
-import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@@ -25,7 +25,7 @@ public class BoardServiceImpl implements BoardService {
    @Autowired
    private RedisUtils redisUtils;
    @Autowired
-    private ISchBasePointService pointService;
+    private PointMapper pointMapper;

    public JSONObject cz() {
        CzDto czDto = boardMapper.cz(String.valueOf(redisUtils.get("sub_tray")));
@@ -39,9 +39,12 @@ public class BoardServiceImpl implements BoardService {
        czDto.setMother_type(String.valueOf(redisUtils.get("mother_type")));
        czDto.setSub_type(String.valueOf(redisUtils.get("sub_type")));
        czDto.setError(String.valueOf(redisUtils.get("error")));
-        SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
-                .eq(SchBasePoint::getPoint_code, "FBC01"));
-        czDto.setFbc(schBasePoint!=null&&schBasePoint.getVehicle_qty()==0?"无货":"有货");
+        Integer schBasePoint = pointMapper.selectCount(new LambdaQueryWrapper<SchBasePoint>()
+                .eq(SchBasePoint::getRegion_code, "FL")
+                .eq(SchBasePoint::getVehicle_qty, 1)
+                .isNotNull(SchBasePoint::getVehicle_code2)
+        );
+        czDto.setFbc(schBasePoint > 0 ?"有货":"无货");
        return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty));
    }

--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
@@ -116,18 +116,24 @@ public class SchBasePointController {
    @PostMapping("/outbound")
    @Log("原材料异常出库")
    @ApiOperation("原材料异常出库")
-    //@SaCheckPermission("@el.check('schBaseRegion:list')")
    public ResponseEntity<Object> outbound(@RequestBody JSONObject param){
        param.put("request_medthod_code", "POINTTask");
        param.put("request_medthod_name", "点对点任务");
        param.put("start_point",param.getString("device_code"));
-        param.put("next_point","FBC01");
-        SchBasePoint schBasePoint= schBasePointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
-                .eq(SchBasePoint::getPoint_code, "FBC01"));
-        if(schBasePoint.getVehicle_qty()==1){
+        SchBasePoint schBasePoint= schBasePointService.findNextPointBYFL();
+
+        if(ObjectUtil.isEmpty(schBasePoint)){
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
+        param.put("next_point",schBasePoint.getPoint_code());
+        BaseResponse baseResponse = acsToWmsService.acsApply(param);
+        Integer resultCode = baseResponse.getCode();
+        if(resultCode == HttpStatus.OK.value()){
+            schBasePoint.setIng_task_code("1");
+            schBasePointService.update(schBasePoint);
+            return new ResponseEntity<>(baseResponse,HttpStatus.OK);
+        }else{
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }
-        BaseResponse baseResponse=acsToWmsService.acsApply(param);
-        return new ResponseEntity<>(baseResponse,HttpStatus.OK);
    }
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
@@ -84,4 +84,7 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
     */
    void updateStatus(JSONObject jsonObject);

+
+    SchBasePoint findNextPointBYFL();
+
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -3,6 +3,7 @@ package org.nl.wms.sch.point.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,11 +24,7 @@ import org.nl.wms.sch.point.service.dto.SchBasePointDto;
 import org.nl.wms.sch.point.service.dto.SchBasePointQuery;
 import org.nl.wms.sch.region.service.dao.SchBaseRegion;
 import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper;
-import org.nl.wms.sch.report.service.dto.ReportDto;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.util.PointUtils;
+import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@@ -46,6 +43,9 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
    @Autowired
    private SchBasePointMapper pointMapper;

+    @Autowired
+    private PointMapper pointMapper2;
+
    @Autowired
    private SchBaseRegionMapper regionMapper;

@@ -220,4 +220,21 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
        }
    }

+    @Override
+    public SchBasePoint findNextPointBYFL() {
+        String regionCode = "FL";
+        List<SchBasePoint> schBasePointList = pointMapper2.findPointByCondition(regionCode, "0",0);
+        for (SchBasePoint schBasePoint : schBasePointList) {
+            //查找点上无载具号无任务号、载具数量为0的
+            if (schBasePoint.getIs_used()
+                    && StringUtils.isEmpty(schBasePoint.getIng_task_code())
+                    && schBasePoint.getVehicle_qty() ==0
+                    && ObjectUtil.isEmpty(schBasePoint.getVehicle_code2())) {
+                log.info("异常出库找到当前符合条件的点位{}", schBasePoint.getPoint_code());
+                return schBasePoint;
+            }
+        }
+        return null;
+    }
+
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
@@ -166,8 +166,9 @@ public class YCLRKTask extends AbstractTask {
            if (ObjectUtil.isNotEmpty(point)){
                return point;
            }else {//2、原料库存区未找到，则去空架缓存区查找
-                regionCode="KJHC";
-                ;return getSchBasePoint(regionCode);
+                //regionCode="KJHC";
+                //return getSchBasePoint(regionCode);
+                return null;
            }
        }

--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -532,8 +532,8 @@ export default {
        })
        .catch(error => {
          // 处理错误情况
-          console.error('提交失败,废包材位有货', error)
-          this.$message.error('提交失败,废包材位有货')
+          console.error('提交失败,废包材位无空位或该点位有未完成的任务!', error)
+          this.$message.error('提交失败,废包材位无空位或该点位有未完成的任务!')
        })
    },
    mysubmit() {