From 4ec19ad5f41bd48d41d389c9a16ed9616aacb8c7 Mon Sep 17 00:00:00 2001 From: Niky <1393756821@qq.com> Date: Tue, 16 Jan 2024 16:25:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=AB=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=89=AB=E7=A0=81=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/acs/service/AcsToWmsService.java | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 68 ++++++++++++------- .../task_manage/task/tasks/yz/YZQLTask.java | 3 +- .../task/tasks/yz/mapper/YZMapper.java | 7 +- .../task/tasks/yz/mapper/YZMapper.xml | 11 ++- 5 files changed, 54 insertions(+), 37 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 445dba7..a0e7d07 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -47,7 +47,7 @@ public interface AcsToWmsService { /** 扫码成功申请 - 判断是否静置完成 */ ApplyTaskResponse isStandingFinish(ApplyTaskRequest baseRequest); /** 扫码成功申请 - 入窑记录时间 */ - ApplyTaskResponse recordKilnTime(ApplyTaskRequest baseRequest); + ApplyTaskResponse recordKilnTime(ApplyTaskRequest baseRequest,String type); /** 压机叫料 */ BaseResponse pressRequestMaterial(JSONObject param); /** 任务反馈 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index cbbf7e6..38515ca 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -54,6 +54,7 @@ import org.nl.wms.sch.task_manage.task.TaskFactory; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.tasks.fj.FJQLTask; import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper; +import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper; import org.nl.wms.util.CommonUtils; import org.nl.wms.util.PointUtils; import org.nl.wms.util.TaskUtils; @@ -123,6 +124,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Autowired private FJMapper fjMapper; + @Autowired + private YZMapper yzMapper; + // 初始化反射方法 @PostConstruct public void initCacheMethod() { @@ -193,18 +197,33 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(workOrder)) { throw new BadRequestException("工单不能为空!"); } - // 从所选区域中，选择满料位、无锁、可用的点位 - List regin = new ArrayList<>(); - regin.add("HCHJ"); - List points = fjMapper.findPointForFJQL(regin, workOrder.getMaterial_id(), workOrder.getCustomer()); - if (ObjectUtil.isEmpty(points)) { - ApplyTaskResponse response = new ApplyTaskResponse(); - response.setRequestNo(requestNo); - response.setMessage("任务申请成功"); - response.setResponseDate(DateUtil.now()); - response.setCode(HttpStatus.HTTP_OK); - response.setIs_needmaterial("0"); - return response; + if ("FJ".equals(basePoint.getRegion_code())){ + // 从所选区域中，选择满料位、无锁、可用的点位 + List regin = new ArrayList<>(); + regin.add("HCHJ"); + List points = fjMapper.findPointForFJQL(regin, workOrder.getMaterial_id(), workOrder.getCustomer()); + if (ObjectUtil.isEmpty(points)) { + ApplyTaskResponse response = new ApplyTaskResponse(); + response.setRequestNo(requestNo); + response.setMessage("缓存货架没有所需物料"); + response.setResponseDate(DateUtil.now()); + response.setCode(HttpStatus.HTTP_BAD_REQUEST); + response.setIs_needmaterial("0"); + return response; + } + } + if ("YZ".equals(basePoint.getRegion_code())){ + List regin = new ArrayList<>(); + regin.add("KL"); + List points = yzMapper.findPointByYZQL(regin, workOrder.getMaterial_id()); + if (ObjectUtil.isEmpty(points)) { + ApplyTaskResponse response = new ApplyTaskResponse(); + response.setRequestNo(requestNo); + response.setMessage("困料货架没有所需物料"); + response.setResponseDate(DateUtil.now()); + response.setCode(HttpStatus.HTTP_BAD_REQUEST); + return response; + } } String configCode = basePoint.getRegion_code() + "QLTask"; // 组织参数 @@ -585,13 +604,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return this.isStandingFinish(baseRequest); // 如果是入窑口就是记录数据 case GeneralDefinition.GZY: - return this.recordKilnTime(baseRequest); + return this.recordKilnTime(baseRequest,GeneralDefinition.GZY); // 入窑缓存线 case GeneralDefinition.RYHCX: - return this.recordKilnTime(baseRequest); + return this.recordKilnTime(baseRequest,GeneralDefinition.RYHCX); // 出窑缓存线 case GeneralDefinition.CYHCX: - return this.recordKilnTime(baseRequest); + return this.recordKilnTime(baseRequest,GeneralDefinition.CYHCX); default: taskResponse.setMessage("参数错误！"); taskResponse.setCode(HttpStatus.HTTP_BAD_REQUEST); @@ -691,7 +710,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * 扫码成功申请 - 入窑记录时间 */ @Override - public ApplyTaskResponse recordKilnTime(ApplyTaskRequest baseRequest) { + public ApplyTaskResponse recordKilnTime(ApplyTaskRequest baseRequest,String type) { log.info("扫码成功申请 - 出入窑记录时间的参数: {}", baseRequest); if (ObjectUtil.isEmpty(baseRequest.getVehicle_code())) { throw new BadRequestException("载具编码不能为空"); @@ -704,17 +723,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 入窑记录时间 SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(), baseRequest.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue()); - if (basePoint.getPoint_type().equals(GeneralDefinition.ENTRANCE) - && ObjectUtil.isNotEmpty(groupInfo.getInto_kiln_time())) { + if (GeneralDefinition.RYHCX.equals(type) && ObjectUtil.isNotEmpty(groupInfo.getInto_kiln_time())) { // 如果已经记录就跳过 return ApplyTaskResponse.responseOk(baseRequest.getRequestNo()); } - if (basePoint.getPoint_type().equals(GeneralDefinition.EXIT) - && ObjectUtil.isNotEmpty(groupInfo.getOut_kiln_time())) { + if (GeneralDefinition.CYHCX.equals(type) && ObjectUtil.isNotEmpty(groupInfo.getOut_kiln_time())) { // 如果已经记录就跳过 return ApplyTaskResponse.responseOk(baseRequest.getRequestNo()); } - recordInOrOutKilnTime(groupInfo, basePoint); + recordInOrOutKilnTime(groupInfo, basePoint,type); if (ObjectUtil.isNotEmpty(basePoint)) { // 记录当前位置 groupInfo.setPoint_code(basePoint.getPoint_code()); // 当前位置 @@ -733,10 +750,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return ApplyTaskResponse.responseOk(baseRequest.getRequestNo(), "扫码成功申请"); } - private void recordInOrOutKilnTime(SchBaseVehiclematerialgroup groupInfo, SchBasePoint basePoint) { - if (GeneralDefinition.ENTRANCE.equals(basePoint.getPoint_type())) { + + + private void recordInOrOutKilnTime(SchBaseVehiclematerialgroup groupInfo, SchBasePoint basePoint,String type) { + if (GeneralDefinition.RYHCX.equals(type)) { groupInfo.setInto_kiln_time(DateUtil.now()); - } else { + } + if (GeneralDefinition.CYHCX.equals(type)) { groupInfo.setOut_kiln_time(DateUtil.now()); groupInfo.setIs_firing(true); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java index 2e98691..1d35226 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java @@ -180,8 +180,7 @@ public class YZQLTask extends AbstractTask { : null; Assert.notNull(workOrder, "工单不能为空!"); // hint: redundance_material_code暂时存在着 - List points = yzMapper.findPointByYZQL(startRegionStr, workOrder.getRaw_material_code(), - extGroupData.getBoolean("is_new")); + List points = yzMapper.findPointByYZQL(startRegionStr, workOrder.getMaterial_id()); return ObjectUtil.isNotEmpty(points) ? points.get(0) : null; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java index 41055de..ee1561d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java @@ -19,13 +19,12 @@ public interface YZMapper { */ int countConveyorLine(String regionCode, String pointType, String pointStatus); /** - * 根据泥料编码获取 + * 根据泥料id获取 * @param regionCode - * @param rawMaterialCode - * @param isNew + * @param materialId * @return */ - List findPointByYZQL(List regionCode, String rawMaterialCode, Boolean isNew); + List findPointByYZQL(List regionCode, String materialId); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml index 6f3787f..53f9430 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml @@ -13,16 +13,15 @@