From 166dd99b7682dd5a063745677d42162b5d2beaf9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Mon, 2 Sep 2024 17:38:01 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=9B=9E=E6=B8=A9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=87=BA=E5=BA=93=E6=8C=89=E9=92=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=9B=20opt:=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=AF=8D=E6=89=98=E7=9B=98=E7=BB=84=E7=9B=98?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9B=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E7=BB=84=E7=9B=98=E8=A7=A3=E7=BB=91=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B=E5=9B=9E=E6=B8=A9=E5=87=BA=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=8C=E6=88=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/service/impl/AcsToWmsServiceImpl.java | 5 +- .../nl/wms/pda/controller/PdaController.java | 3 + .../wms/pda/service/impl/PdaServiceImpl.java | 26 +++---- .../ISchBaseVehiclematerialgroupService.java | 6 ++ .../SchBaseVehiclematerialgroupMapper.xml | 2 + ...chBaseVehiclematerialgroupServiceImpl.java | 21 ++++++ .../controller/SchBasePointController.java | 8 +++ .../service/impl/SchBasePointServiceImpl.java | 17 +++-- .../nl/wms/sch/report/ReportController.java | 10 +++ .../sch/report/service/IReportService.java | 3 + .../service/dao/mapper/ReportMapper.xml | 1 + .../nl/wms/sch/report/service/dto/HwDto.java | 2 + .../service/impl/ReportServiceImpl.java | 40 +++++++++++ .../sch/task/service/ISchBaseTaskService.java | 2 +- .../service/impl/SchBaseTaskServiceImpl.java | 17 +++-- .../nl/wms/sch/task_manage/AbstractTask.java | 7 +- .../sch/task_manage/task/tasks/POINTTask.java | 57 ++++++++-------- .../sch/task_manage/task/tasks/YCLCKTask.java | 13 ++-- .../service/impl/WorkorderServiceImpl.java | 14 +++- .../src/views/wms/hw/detail/index.vue | 68 ++++++++++++++----- .../src/views/wms/sch/point/index.vue | 10 +-- .../src/views/wms/sch/point/schBasePoint.js | 4 +- 22 files changed, 248 insertions(+), 88 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index 506b738..c986f79 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -160,7 +160,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { throw new BadRequestException("任务类型不正确!requestMethodCode："+requestMethodName+",device_code："+device_code); } // 执行创建任务 - task.apply(param); + String task_code = task.apply(param); + Map parameters = new HashMap(); + parameters.put("task_code",task_code); + result.setParameters(parameters); return result; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java index 0b138d4..9f1484a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java @@ -60,6 +60,9 @@ public class PdaController { region.setVehicle_qty(0); } } + if("KJ".equals(whereJson.get("region_code"))){ + region.setVehicle_qty(null); + } return new ResponseEntity<>(pointService.getPointListByPda(region), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index c6bacb9..ffba98f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -90,8 +90,7 @@ public class PdaServiceImpl implements PdaService { @Override public PdaResponseVo zpjb(JSONObject param) { String subTray=param.getString("sub_tray"); - String motherTray=param.getString("mother_tray"); - //母盘解绑 + //子拖盘解绑 if(ObjectUtil.isNotEmpty(subTray)){ SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper() .eq(SchBaseVehiclematerialgroup::getVehicle_code, subTray) @@ -103,35 +102,38 @@ public class PdaServiceImpl implements PdaService { vehiclematerialgroupService.updateById(one); } List schBasePointList= pointMapper.selectList(new LambdaQueryWrapper() - .eq(SchBasePoint::getVehicle_code, subTray)); + .eq(SchBasePoint::getVehicle_code2, subTray)); for(SchBasePoint schBasePoint:schBasePointList){ - schBasePoint.setVehicle_code(""); + schBasePoint.setVehicle_code2(""); schBasePoint.setVehicle_qty(0); pointService.update(schBasePoint); } } - //子盘解绑 + String motherTray = param.getString("mother_tray"); + //母盘解绑 if(ObjectUtil.isNotEmpty(motherTray)){ - SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper() - .eq(SchBaseVehiclematerialgroup::getVehicle_code, motherTray) - .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, - GroupBindMaterialStatusEnum.BOUND.getValue())); + //查询母托盘 + JSONObject group_jo = new JSONObject(); + group_jo.put("vehicle_code",motherTray); + SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroup(group_jo); if (ObjectUtil.isNotEmpty(one)) { + one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); + one.setUpdate_id(GeneralDefinition.ACS_ID); + one.setUpdate_name(GeneralDefinition.ACS_NAME); one.setUpdate_time(DateUtil.now()); - vehiclematerialgroupService.updateById(one); + vehiclematerialgroupService.updateByJson(one); } List schBasePointList= pointMapper.selectList(new LambdaQueryWrapper() .eq(SchBasePoint::getVehicle_code, motherTray)); for(SchBasePoint schBasePoint:schBasePointList){ - schBasePoint.setVehicle_code2(""); + schBasePoint.setVehicle_code(""); pointService.update(schBasePoint); } UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("palletSN",motherTray); updateWrapper.set("group_bind_material_status",GroupBindMaterialStatusEnum.UNBOUND.getValue()); materialMapper.update(null,updateWrapper); - } return PdaResponseVo.pdaResultOk("组盘解绑成功"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java index f4c154d..cca07c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java @@ -37,6 +37,12 @@ public interface ISchBaseVehiclematerialgroupService extends IService AND vg.group_bind_material_status = '2' + order by vg.update_time + LIMIT 1 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java index 3a97dec..4345dd1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,6 +17,8 @@ import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; +import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; +import org.nl.wms.sch.workorder.service.dao.Workorder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -68,6 +71,24 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("vehicle_code",entity.getVehicle_code()); + updateWrapper.le("group_bind_material_status","2"); + + updateWrapper.set("task_code",entity.getTask_code()); + updateWrapper.set("point_code",entity.getPoint_code()); + updateWrapper.set("point_name",entity.getPoint_name()); + updateWrapper.set("move_way",entity.getMove_way()); + updateWrapper.set("group_bind_material_status", entity.getGroup_bind_material_status()); + updateWrapper.set("update_id",entity.getUpdate_id()); + updateWrapper.set("update_name",entity.getUpdate_name()); + updateWrapper.set("update_time",entity.getUpdate_time()); + vehiclematerialgroupMapper.update(null,updateWrapper); + } + @Override public void deleteAll(Set ids) { // 真删除 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 75ae41e..5e80e39 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 @@ -107,6 +107,14 @@ public class SchBasePointController { return new ResponseEntity<>(schBasePointService.getPointList(region),HttpStatus.OK); } + @PostMapping("/getPointListByPda") + @Log("获取区域下拉框") + @ApiOperation("获取区域下拉框") + //@SaCheckPermission("@el.check('schBaseRegion:list')") + public ResponseEntity getPointListByPda(@RequestBody(required = false) SchBasePoint region){ + return new ResponseEntity<>(schBasePointService.getPointListByPda(region),HttpStatus.OK); + } + @PostMapping("/getPointsByRegionCodes") @Log("获取区域下拉框") @ApiOperation("获取区域下拉框") 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 a6436bf..72aaf1e 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 @@ -121,10 +121,11 @@ public class SchBasePointServiceImpl extends ServiceImpl(TableDataInfo.build(reportService.getIngotBatchList()),HttpStatus.OK); } + @PostMapping("/hwtask") + @Log("回温出库") + @ApiOperation("回温出库") + public ResponseEntity hwtask(@RequestBody JSONObject param){ + log.info("回温出库任务："+param.toString()); + reportService.hwtask(param); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java index d1dfeb9..f2249e4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java @@ -1,5 +1,6 @@ package org.nl.wms.sch.report.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; @@ -76,4 +77,6 @@ public interface IReportService extends IService { List getIngotBatchList(); + void hwtask(JSONObject param); + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml index ca39f15..5a986d5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml @@ -272,6 +272,7 @@ p.vehicle_code2 AS subTray, p.vehicle_code AS motherTray, p.update_time AS updateTime, + p.ing_task_code AS ing_task_code, ANY_VALUE ( v.standing_time ) AS standingTime, ANY_VALUE ( m2.siliconGrade ) AS siliconGrade, ANY_VALUE ( m2.productDescription ) AS productDescription, diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java index a4f4782..c20dd9a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java @@ -38,4 +38,6 @@ public class HwDto implements Serializable { private String siliconGrade; /** 客户来料批次号 */ private String ingotBatch; + /** 任务号 */ + private String ing_task_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java index d8426d4..da5d0c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java @@ -1,5 +1,7 @@ package org.nl.wms.sch.report.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -7,11 +9,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; +import org.nl.wms.ext.service.AcsToWmsService; +import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; import org.nl.wms.sch.material.service.dao.Material; import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.report.service.IReportService; import org.nl.wms.sch.report.service.dao.mapper.ReportMapper; import org.nl.wms.sch.report.service.dto.*; @@ -32,6 +39,10 @@ public class ReportServiceImpl extends ServiceImpl impl @Autowired private ReportMapper reportMapper; + @Autowired + private AcsToWmsService acsToWmsService; + @Autowired + private ISchBasePointService pointService; @Override public IPage queryAll(ReportQuery query, PageQuery pageQuery){ @@ -322,6 +333,35 @@ public class ReportServiceImpl extends ServiceImpl impl } + @Override + public void hwtask(JSONObject param){ + param.put("request_medthod_code", "POINTTask"); + param.put("request_medthod_name", "点对点任务"); + param.put("device_code",param.getString("start_point")); + BaseResponse result = acsToWmsService.pdaApply(param); + Integer resultCode = result.getCode(); + if(resultCode.equals(200)){ + //更新起点终点任务号 + SchBasePoint schBasePoint = pointService.getById(param.getString("start_point")); + SchBasePoint nextSchBasePoint = pointService.getById(param.getString("next_point")); + Map parameters = result.getParameters(); + //设置初始值 + schBasePoint.setIng_task_code("1"); + nextSchBasePoint.setIng_task_code("1"); + if(ObjectUtil.isNotNull(parameters)){ + String task_code = parameters.get("task_code"); + if(ObjectUtil.isNotEmpty(task_code)){ + schBasePoint.setIng_task_code(task_code); + nextSchBasePoint.setIng_task_code(task_code); + } + } + //发起任务时先把点位占用，防止发起重复任务 + pointService.update(schBasePoint); + pointService.update(nextSchBasePoint); + }else{ + throw new BadRequestException("回温出库失败:+"+result.getMessage()); + } + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index dfdf309..da765bd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -34,7 +34,7 @@ public interface ISchBaseTaskService extends IService { * * @param entity / */ - void create(SchBaseTask entity); + String create(SchBaseTask entity); /** * 编辑 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index d2bcb73..4b5a061 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -166,7 +166,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl parameters = baseResponse.getParameters(); + //设置初始值 schBasePoint.setIng_task_code("1"); - pointService.update(schBasePoint); nexSchBasePoint.setIng_task_code("1"); + if(ObjectUtil.isNotNull(parameters)){ + String task_code = parameters.get("task_code"); + if(ObjectUtil.isNotEmpty(task_code)){ + schBasePoint.setIng_task_code(task_code); + nexSchBasePoint.setIng_task_code(task_code); + } + } + //发起任务时先把点位占用，防止发起重复任务 + pointService.update(schBasePoint); pointService.update(nexSchBasePoint); nextList.remove(0); }else{ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index 5b8d995..5f81184 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -163,7 +163,7 @@ public abstract class AbstractTask { * @param param * @throws BadRequestException */ - public void apply(JSONObject param) throws BadRequestException { + public String apply(JSONObject param) throws BadRequestException { // 申请任务 SchBaseTask task = new SchBaseTask(); // 任务实体 String apply_point_code = param.getString("device_code"); // 请求点 @@ -251,7 +251,7 @@ public abstract class AbstractTask { // 校验是否需要自动agv if (!pointObj.getIs_auto()) { // 如果不需要自动，则不创建任务 - return; + return "1"; } // 2、创建申请任务 task.setAcs_trace_id(param.getString("acs_trace_id")); @@ -283,7 +283,8 @@ public abstract class AbstractTask { task.setCreate_name(nickName); task.setUpdate_id(currentUserId); task.setUpdate_name(nickName); - taskService.create(task); + String task_code =taskService.create(task); + return task_code; } public void updateTaskStatus(String task_code, TaskStatus status) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java index 865ae43..2746c2d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java @@ -181,48 +181,45 @@ public class POINTTask extends AbstractTask { String vehicleCode=taskObj.getVehicle_code(); String vehicleCode2= taskObj.getVehicle_code2(); SchBaseVehiclematerialgroup one =null; + //母托盘更新组盘信息 if(StringUtils.isNotEmpty(vehicleCode)) { - one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper() - .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getPoint_code, startPoint) - .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, - GroupBindMaterialStatusEnum.BOUND.getValue())); - } - if (ObjectUtil.isNotEmpty(one)) { - one.setTask_code(taskObj.getTask_code()); - one.setPoint_code(endPointObj.getPoint_code()); // 当前位置 - one.setPoint_name(endPointObj.getPoint_name()); - one.setMove_way(one.getMove_way() == null ? "" : (one.getMove_way() + " -> ") + endPointObj.getPoint_code()); - one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); - one.setUpdate_id(GeneralDefinition.ACS_ID); - one.setUpdate_name(GeneralDefinition.ACS_NAME); - one.setUpdate_time(DateUtil.now()); - vehiclematerialgroupService.updateById(one); + JSONObject group_jo = new JSONObject(); + group_jo.put("vehicle_code",vehicleCode); + one = vehiclematerialgroupService.getGroup(group_jo); + if (ObjectUtil.isNotEmpty(one)) { + one.setTask_code(taskObj.getTask_code()); + one.setPoint_code(endPointObj.getPoint_code()); // 当前位置 + one.setPoint_name(endPointObj.getPoint_name()); + one.setMove_way(one.getMove_way() == null ? "" : (one.getMove_way() + " -> ") + endPointObj.getPoint_code()); + one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); + one.setUpdate_id(GeneralDefinition.ACS_ID); + one.setUpdate_name(GeneralDefinition.ACS_NAME); + one.setUpdate_time(DateUtil.now()); + vehiclematerialgroupService.updateByJson(one); + } } - + //子托盘更新组盘信息 if(StringUtils.isNotEmpty(vehicleCode2)) { one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper() .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode2) .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue())); + if (ObjectUtil.isNotEmpty(one)) { + one.setTask_code(taskObj.getTask_code()); + one.setPoint_code(endPointObj.getPoint_code()); // 当前位置 + one.setPoint_name(endPointObj.getPoint_name()); + one.setMove_way(one.getMove_way() == null ? "" : (one.getMove_way() + " -> ") + endPointObj.getPoint_code()); + one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); + one.setUpdate_id(GeneralDefinition.ACS_ID); + one.setUpdate_name(GeneralDefinition.ACS_NAME); + one.setUpdate_time(DateUtil.now()); + vehiclematerialgroupService.updateById(one); + } if(endPointObj.getPoint_code().contains("XHW")){ //pdm_bd_workorder_two任务完成时，status改为3 workorderService.update(vehicleCode2,"3"); } } - if (ObjectUtil.isNotEmpty(one)) { -// throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到"); -// } - one.setTask_code(taskObj.getTask_code()); - one.setPoint_code(endPointObj.getPoint_code()); // 当前位置 - one.setPoint_name(endPointObj.getPoint_name()); - one.setMove_way(one.getMove_way() == null ? "" : (one.getMove_way() + " -> ") + endPointObj.getPoint_code()); - one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); - one.setUpdate_id(GeneralDefinition.ACS_ID); - one.setUpdate_name(GeneralDefinition.ACS_NAME); - one.setUpdate_time(DateUtil.now()); - vehiclematerialgroupService.updateById(one); - } // 终点解锁 endPointObj.setIng_task_code(""); endPointObj.setVehicle_code(taskObj.getVehicle_code()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 842eaf3..a406017 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -210,11 +210,12 @@ public class YCLCKTask extends AbstractTask { if (status.equals(TaskStatus.FINISHED)) { // 完成 String vehicleCode = taskObj.getVehicle_code(); String vehicleCode2 = taskObj.getVehicle_code2(); - SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper() - .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getPoint_code, startPoint) - .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, - GroupBindMaterialStatusEnum.BOUND.getValue())); + + //查询母托盘 + JSONObject group_jo = new JSONObject(); + group_jo.put("vehicle_code",vehicleCode); + SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroup(group_jo); + if (ObjectUtil.isNotEmpty(one)) { one.setTask_code(taskObj.getTask_code()); one.setPoint_code(endPointObj.getPoint_code()); // 当前位置 @@ -225,7 +226,7 @@ public class YCLCKTask extends AbstractTask { one.setUpdate_id(GeneralDefinition.ACS_ID); one.setUpdate_name(GeneralDefinition.ACS_NAME); one.setUpdate_time(DateUtil.now()); - vehiclematerialgroupService.updateById(one); + vehiclematerialgroupService.updateByJson(one); } one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper() .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode2) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java index 8c8ee1e..c9f53cd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java @@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -177,10 +178,19 @@ public class WorkorderServiceImpl extends ServiceImpl parameters = baseResponse.getParameters(); + //设置初始值 schBasePoint.setIng_task_code("1"); - pointService.update(schBasePoint); nexSchBasePoint.setIng_task_code("1"); + if(ObjectUtil.isNotNull(parameters)){ + String task_code = parameters.get("task_code"); + if(ObjectUtil.isNotEmpty(task_code)){ + schBasePoint.setIng_task_code(task_code); + nexSchBasePoint.setIng_task_code(task_code); + } + } + //发起任务时先把点位占用，防止发起重复任务 + pointService.update(schBasePoint); pointService.update(nexSchBasePoint); nextList.remove(0); }else{ diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue index 29cadf6..8fcbecc 100644 --- a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue +++ b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue @@ -107,16 +107,7 @@ - - - - + @@ -134,10 +125,35 @@ {{ scope.row.standingTime > scope.row.usedTime ? '未完成' : '已完成' }} + + + + @@ -152,7 +168,7 @@
- 取消 + 取消 确认
@@ -164,14 +180,12 @@