From c58cd0aeded632fd828670228b5b5a4bfec6e2cb Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 3 Dec 2024 16:33:25 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=A9=BA=E6=9E=B6=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=8C=BA=E6=94=B9=E6=88=90=E5=8F=AA=E6=94=BE=E7=A9=BA=E6=9E=B6?= =?UTF-8?q?=EF=BC=8C=20=E5=A2=9E=E5=8A=A0=E7=82=B9=E4=BD=8D=20=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8B=86=E5=8C=85=E5=8C=BA=20=20FHW01-09-01,991=20?= =?UTF-8?q?=E5=BA=9F=E5=8C=85=E6=9D=90=E5=A4=84=E7=90=86=E5=8C=BA=20FBC02,?= =?UTF-8?q?1005?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/service/impl/BoardServiceImpl.java | 13 +++++---- .../controller/SchBasePointController.java | 20 +++++++++----- .../point/service/ISchBasePointService.java | 3 +++ .../service/impl/SchBasePointServiceImpl.java | 27 +++++++++++++++---- .../sch/task_manage/task/tasks/YCLRKTask.java | 5 ++-- .../src/views/wms/sch/point/index.vue | 4 +-- 6 files changed, 51 insertions(+), 21 deletions(-) diff --git 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 index 82e3964..372b628 100644 --- 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() - .eq(SchBasePoint::getPoint_code, "FBC01")); - czDto.setFbc(schBasePoint!=null&&schBasePoint.getVehicle_qty()==0?"无货":"有货"); + Integer schBasePoint = pointMapper.selectCount(new LambdaQueryWrapper() + .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)); } diff --git 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 index 8b5331e..9693a31 100644 --- 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 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() - .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); } } diff --git 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 index 7115f44..49a74a3 100644 --- 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 { */ void updateStatus(JSONObject jsonObject); + + SchBasePoint findNextPointBYFL(); + } diff --git 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 index 49a3357..a7862bc 100644 --- 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 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; + } + } diff --git 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 index 1ec3ba8..37af1ad 100644 --- 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; } } diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 2232efd..0ed74c6 100644 --- 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() {