From 9d5d22a1228920ff11bb12b57a3d97623f889d37 Mon Sep 17 00:00:00 2001 From: yanps Date: Tue, 24 Sep 2024 17:56:10 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7,=E7=BB=84=E7=9B=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/NDCAgvServiceImpl.java | 2 +- .../org/nl/quartz/task/AutoCreateInst.java | 2 +- .../controller/HandheldController.java | 7 +++ .../ext/handheld/service/HandheldService.java | 6 ++ .../service/impl/HandheldServiceImpl.java | 56 ++++++++++++------- .../service/impl/SortingServiceImpl.java | 8 +-- ...SchBaseVehiclematerialgroupController.java | 8 +++ .../ISchBaseVehiclematerialgroupService.java | 7 +++ .../dao/SchBaseVehiclematerialgroup.java | 7 +++ .../SchBaseVehiclematerialgroupMapper.java | 9 ++- .../SchBaseVehiclematerialgroupMapper.xml | 26 ++++++++- ...chBaseVehiclematerialgroupServiceImpl.java | 37 ++++++++---- .../point/service/ISchBasePointService.java | 29 ++++++---- .../dao/mapper/SchBasePointMapper.java | 8 +++ .../service/dao/mapper/SchBasePointMapper.xml | 56 ++++++++++--------- .../service/impl/SchBasePointServiceImpl.java | 18 +++--- .../service/impl/SchBaseTaskServiceImpl.java | 2 + .../task/tasks/connector/CNTTask.java | 5 +- .../task/tasks/sorting/SortingSMTTask.java | 6 +- .../src/views/wms/produceScreen/index.vue | 2 +- .../src/views/wms/sch/group/index.vue | 33 +++++++++-- 21 files changed, 241 insertions(+), 93 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index 03e3135..d43a480 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -118,7 +118,7 @@ public class NDCAgvServiceImpl implements NDCAgvService { (byte) 0X00, (byte) 0X01, (byte) 0X00, (byte) 0X71, (byte) 0X00, (byte) 0X10, - (byte) 0X01, (byte) 0X80, + (byte) 0X01, (byte) prioritylow, (byte) 0X00, (byte) 0X01, (byte) ikeyhigh, (byte) ikeylow, (byte) ikeyhigh, (byte) ikeylow, diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java index 810c3d3..43ce33d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java @@ -42,7 +42,7 @@ public class AutoCreateInst { RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); ISysParamService acsConfigService = SpringContextHolder.getBean(ISysParamService.class); List list = taskserver.queryByStauts("0"); - list = list.stream().sorted(Comparator.comparing(TaskDto::getPriority)).collect(Collectors.toList()); + list = list.stream().sorted(Comparator.comparing(TaskDto::getPriority).reversed()).collect(Collectors.toList()); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); for (int i = 0; i < list.size(); i++) { TaskDto acsTask = list.get(i); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/controller/HandheldController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/controller/HandheldController.java index 1084486..11e853a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/controller/HandheldController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/controller/HandheldController.java @@ -135,4 +135,11 @@ public class HandheldController { } + @GetMapping("/selectPointByRegion") + @Log("根据工序查询设备点位") + public ResponseEntity selectPointByRegion(String regionCode) { + return new ResponseEntity<>(handheldService.selectPointByRegion(regionCode),HttpStatus.OK); + } + + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/HandheldService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/HandheldService.java index 213d1eb..31f1344 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/HandheldService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/HandheldService.java @@ -107,4 +107,10 @@ public interface HandheldService { * @return */ boolean isLock(); + + /** + * 根据工序获取所有设备点位 + * @return + */ + List selectPointByRegion(String regionCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java index 1e05592..ca38106 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java @@ -38,6 +38,7 @@ import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.task.TaskFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -394,29 +395,39 @@ public class HandheldServiceImpl implements HandheldService { @Override + @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED) public String pointLock(JSONObject param) { Assert.noNullElements(new Object[]{param.getString("region_code"), param.getString("status")}, "参数不能为空!"); - JSONArray region_code = param.getJSONArray("region_code"); + String region_code = param.getString("region_code"); String status = param.getString("status"); - region_code.stream().forEach(region -> { - String s = StrUtil.toString(region); - SchBaseRegion schBaseRegion = iSchBaseRegionService.getOne(Wrappers.lambdaQuery(SchBaseRegion.class) - .eq(SchBaseRegion::getRegion_code, s)); - if (ObjectUtil.isEmpty(schBaseRegion)) throw new BadRequestException("该区域不存在!"); - List pointCodes = iSchBasePointService.getByRegionCode(s); - if (StrUtil.equals(status, "0")) { - iSchBasePointService.releasePoint(s); - iSchBaseTaskService.updateTaskStatusByPointCode(pointCodes); - } else if (StrUtil.equals(status, "1")) { - boolean is_executing = iSchBaseTaskService.selectByPointCodeAndStatus(pointCodes); - if (is_executing) { - throw new BadRequestException("该区域有任务正在执行，请等待任务执行完成再锁定!"); - } - iSchBaseTaskService.selectByPointCodeAndTaskStatus(pointCodes); - iSchBasePointService.lockPoint(s); + SchBaseRegion schBaseRegion = iSchBaseRegionService.getOne(Wrappers.lambdaQuery(SchBaseRegion.class) + .eq(SchBaseRegion::getRegion_code, region_code)); + if (ObjectUtil.isEmpty(schBaseRegion)) throw new BadRequestException("该区域不存在!"); + List pointCodes = iSchBasePointService.getByRegionCode(region_code); + if (StrUtil.equals(status, "0")) { + iSchBaseTaskService.updateTaskStatusByPointCode(pointCodes); + if (param.getJSONArray("pointCodes").size() > 0) { + param.getJSONArray("pointCodes").stream().forEach(pointCode -> { + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(pointCode); + iSchBaseVehiclematerialgroupService.remove(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) + .eq(SchBaseVehiclematerialgroup::getVehicle_code, jsonObject.get("vehicle_code"))); + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getPoint_code, jsonObject.get("point_code")) + .set(SchBasePoint::getPoint_status, GoodsEnum.OUT_OF_STOCK.getValue()) + .set(SchBasePoint::getIs_lock, false) + .set(SchBasePoint::getVehicle_code, null)); + }); } - }); - return "操作成功"; + iSchBasePointService.updatePointLock(region_code, false); + } else if (StrUtil.equals(status, "1")) { + boolean is_executing = iSchBaseTaskService.selectByPointCodeAndStatus(pointCodes); + if (is_executing) { + throw new BadRequestException("该区域有任务正在执行，请等待任务执行完成再锁定!"); + } + iSchBaseTaskService.selectByPointCodeAndTaskStatus(pointCodes); + iSchBasePointService.updatePointLock(region_code, true); + } + return "succeed"; } @Override @@ -625,4 +636,11 @@ public class HandheldServiceImpl implements HandheldService { } + @Override + public List selectPointByRegion(String regionCode) { + Assert.notNull(regionCode, "参数不能为空!"); + return iSchBasePointService.selectPointByRegion(regionCode); + } + + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java index 905220b..5d7d63a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java @@ -132,7 +132,7 @@ public class SortingServiceImpl implements SortingService { //TODO:呼叫两个空笼框 if (SortingEnum.TASK_TYPE_ONE.getValue().equals(task_type) && SortingEnum.IS_EMPTY.getValue().equals(is_empty)) { taskParam.put("device_code", pointCode + "_01"); - taskParam.put("task_seq", "1"); + taskParam.put("task_seq", "2"); taskParam.put("config_code", "SortingTwoCNTTask"); taskParam.put("task_code", task_code + "A"); connectorTask.apply(taskParam); @@ -141,7 +141,7 @@ public class SortingServiceImpl implements SortingService { .set("remark", task_code) .eq("point_code", pointCode + "_01")); taskParam.put("device_code", pointCode + "_02"); - taskParam.put("task_seq", "2"); + taskParam.put("task_seq", "1"); taskParam.put("task_code", task_code + "B"); connectorTask.apply(taskParam); iSchBasePointService.update(new UpdateWrapper() @@ -164,7 +164,7 @@ public class SortingServiceImpl implements SortingService { } taskParam.put("config_code", "SortingSMTTask"); taskParam.put("vehicle_code", vehicle_code); - taskParam.put("task_seq", "2"); + taskParam.put("task_seq", "1"); taskParam.put("device_code", pointCode + "_01"); taskParam.put("task_code", task_code + "A"); connectorTask.apply(taskParam); @@ -176,7 +176,7 @@ public class SortingServiceImpl implements SortingService { taskParam = new JSONObject(MapOf.of("task_code", task_code, "job_name", jobname, "device_code", pointCode, "requestNo" , "sorting_" + IdUtil.getStringId(), "ext_data", jsonObject, "vehicle_code", vehicle_code, "ext_data", jsonObject)); taskParam.put("config_code", "SortingSMTTask"); - taskParam.put("task_seq", "1"); + taskParam.put("task_seq", "2"); taskParam.put("vehicle_code", jsonObject.getString("vehicle_code2")); taskParam.put("device_code", pointCode + "_02"); taskParam.put("task_code", task_code + "B"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java index 725d580..aa6cf28 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java @@ -72,4 +72,12 @@ public class SchBaseVehiclematerialgroupController { public ResponseEntity getGroup(@RequestBody JSONObject entity){ return new ResponseEntity<>(schBaseVehiclematerialgroupService.getGroup(entity), HttpStatus.OK); } + + + @PostMapping("/selectByVehicleCode") + @Log("根据载具号获取阻盘信息") + @ApiOperation("根据载具号获取阻盘信息") + public ResponseEntity selectByVehicleCode(@RequestBody JSONObject entity){ + return new ResponseEntity<>(schBaseVehiclematerialgroupService.selectByVehicleCode(entity), HttpStatus.OK); + } } 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 4f421bd..d8c26f7 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 @@ -80,4 +80,11 @@ public interface ISchBaseVehiclematerialgroupService extends IService selectMaterialByVehicleCode(String vehicle_code); + + /** + * 根据载具号查找物料信息 + * @param entity + * @return + */ + List selectByVehicleCode(JSONObject entity); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java index e6a962b..b13710f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** * @author lyd @@ -162,6 +163,12 @@ public class SchBaseVehiclematerialgroup implements Serializable { @TableField(exist = false) private String material_name; @TableField(exist = false) + private String theLocation; + @TableField(exist = false) + private boolean hasChildren; + @TableField(exist = false) + private List children; + @TableField(exist = false) private String material_code; @TableField(exist = false) private String material_spec; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java index 0e66d97..7ca7cb8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; @@ -12,9 +13,9 @@ import java.util.List; import java.util.Map; /** -* @author lyd -* @date 2023-05-16 -**/ + * @author lyd + * @date 2023-05-16 + **/ public interface SchBaseVehiclematerialgroupMapper extends BaseMapper { IPage selectPageLeftJoin(IPage pages, SchBaseVehiclematerialgroupQuery query); @@ -24,4 +25,6 @@ public interface SchBaseVehiclematerialgroupMapper extends BaseMapper selectOrders(@Param("list") List vehicleCodes); List selectMaterialByVehicleCode(String vehicle_code); + + IPage selectAllByPage(IPage page, @Param("query") SchBaseVehiclematerialgroupQuery query); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml index 4216693..0bacc91 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml @@ -71,5 +71,29 @@ GROUP BY sbv.order_code - + 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 6f9a367..3b41af6 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 @@ -27,6 +27,7 @@ import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.process_flow.service.ProcessFlowService; +import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,19 +50,13 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page) { IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - IPage schBaseVehiclematerialgroupIPage = vehiclematerialgroupMapper.selectPage(pages, Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) - .eq(StrUtil.isNotBlank(whereJson.getVehicle_code()), SchBaseVehiclematerialgroup::getVehicle_code, whereJson.getVehicle_code()) - .eq(StrUtil.isNotBlank(whereJson.getWorkshop_code()), SchBaseVehiclematerialgroup::getWorkshop_code, whereJson.getWorkshop_code()) - .eq(StrUtil.isNotBlank(whereJson.getJob_name()), SchBaseVehiclematerialgroup::getJob_name, whereJson.getJob_name()) - .eq(StrUtil.isNotBlank(whereJson.getRegion_code()), SchBaseVehiclematerialgroup::getRegion_code, whereJson.getRegion_code())); + IPage schBaseVehiclematerialgroupIPage = vehiclematerialgroupMapper.selectAllByPage(pages, whereJson); schBaseVehiclematerialgroupIPage.getRecords().forEach(item -> { if (StrUtil.isNotBlank(item.getMaterial_id())) { MdBaseMaterial mdBaseMaterial = iMdBaseMaterialService.getOne(Wrappers.lambdaQuery(MdBaseMaterial.class) @@ -73,11 +68,23 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl schBaseVehiclematerialgroups = vehiclematerialgroupMapper.selectList(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) + .eq(SchBaseVehiclematerialgroup::getVehicle_code, item.getVehicle_code()) + .ne(SchBaseVehiclematerialgroup::getGroup_id, item.getGroup_id())); + if (CollUtil.isNotEmpty(schBaseVehiclematerialgroups)) { + item.setHasChildren(true); + item.setChildren(schBaseVehiclematerialgroups); } }); -// pages = vehiclematerialgroupMapper.selectPageLeftJoin(pages, whereJson); return schBaseVehiclematerialgroupIPage; } @@ -158,7 +165,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl { - if(ObjectUtil.isNotEmpty(order.get("due_date"))){ + if (ObjectUtil.isNotEmpty(order.get("due_date"))) { return getTime(StrUtil.toString(order.get("due_date"))); } return 0; @@ -166,7 +173,15 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl selectByVehicleCode(JSONObject entity) { + List schBaseVehiclematerialgroups = vehiclematerialgroupMapper.selectList(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) + .eq(SchBaseVehiclematerialgroup::getVehicle_code, entity.getString("vehicle_code")) + .ne(SchBaseVehiclematerialgroup::getGroup_id, entity.getString("group_id"))); + return schBaseVehiclematerialgroups; + } + + private Long getTime(String dateString) { String pattern = "yyyy-MM-dd HH:mm:ss"; java.util.Date date = DateUtil.parse(dateString, pattern); long timestamp = date.getTime(); 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 81d5740..c4dd523 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 @@ -92,7 +92,7 @@ public interface ISchBasePointService extends IService { * * @param region_code */ - SchBasePoint selectByRegionCode(String region_code, String vehicleCode,String point_type); + SchBasePoint selectByRegionCode(String region_code, String vehicleCode, String point_type); /** * 根据工序查询区域空载具 @@ -158,37 +158,35 @@ public interface ISchBasePointService extends IService { * @param vehicle_type * @return */ - SchBasePoint selectByGroundPoint(String region_code,String pointStatus, String vehicle_type, int seq); + SchBasePoint selectByGroundPoint(String region_code, String pointStatus, String vehicle_type, int seq); /** * 呼叫空料笼 + * * @param region_code * @param vehicle_type * @return */ - SchBasePoint selectByEmptyCage(String region_code,String vehicle_type,String pointStatus ,boolean isVehicle,SchBaseTask task); - - /** - * 释放点位 - * @param region_code - */ - void releasePoint(String region_code); + SchBasePoint selectByEmptyCage(String region_code, String vehicle_type, String pointStatus, boolean isVehicle, SchBaseTask task); /** - * 锁定点位 + * 修改点位锁状态 + * * @param region_code */ - void lockPoint(String region_code); + void updatePointLock(String region_code, Boolean lock); /** * 根据区域编码查找点位名称 + * * @return */ List getByRegionCode(String region_code); /** * 查找地面区域的空点位 + * * @param targetRegionCode * @param value */ @@ -201,8 +199,17 @@ public interface ISchBasePointService extends IService { /** * 根据工序查询订单 + * * @param regionCode * @return */ List selectOrder(String regionCode); + + /** + * 根据工序查找设备点位 + * + * @param regionCode + * @return + */ + List selectPointByRegion(String regionCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java index 3205eac..c8df7a6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java @@ -1,5 +1,6 @@ package org.nl.wms.sch.point.service.dao.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.nl.wms.ext.fab.service.dto.OrderMater; @@ -29,4 +30,11 @@ public interface SchBasePointMapper extends BaseMapper { List selectByRegionCode(@Param("region_code") String region_code); List selectJobDevice(); + + /** + * 根据工序查询设备点位 + * @param regionCode + * @return + */ + List selectPointByRegion(String regionCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index 4579ba2..9040af3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -13,48 +13,54 @@ + 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 a8c7385..e4b8b0d 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 @@ -467,13 +467,10 @@ public class SchBasePointServiceImpl extends ServiceImpl selectPointByRegion(String regionCode) { + return pointMapper.selectPointByRegion(regionCode); + } + @Override public List getStructList(String region_code, String vehicle_type) { //1.查询的结果一个托盘有多个800，PC需要怎么展示？ @@ -543,7 +545,7 @@ public class SchBasePointServiceImpl extends ServiceImpl tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY); // 配置信息 - SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() - .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); - tasks = tasks.stream().sorted(Comparator.comparing(SchBaseTask::getAcs_trace_id)).collect(Collectors.toList()); + /*SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() + .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));*/ + tasks = tasks.stream().sorted(Comparator.comparing(SchBaseTask::getAcs_trace_id, Comparator.nullsLast(Comparator.naturalOrder())).reversed()).collect(Collectors.toList()); for (SchBaseTask task : tasks) { TaskUtils.setUpdateByAcs(task); // 找起点 diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue index 712033a..5bbc06c 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue +++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue @@ -224,7 +224,7 @@ export default { popSecList: [], currentRow: null, value: '', - options: [{ value: 'G01', label: '钢托盘' }, { value: 'R01', label: '990mm笼框' }, { value: 'R02', label: '450mm 笼框' }, { value: 'S04', label: '1670mm料架' }, { value: 'S06', label: '1700mm料架' }], + options: [{ value: 'G01', label: 'G01' }, { value: 'R01', label: 'R01' }, { value: 'R02', label: 'R02' }, { value: 'S04', label: 'S04' }, { value: 'S06', label: 'S06' }], value1: '', options1: [{ value: '1', label: '货架' }, { value: '2', label: '内部' }, { value: '3', label: '外协' }], value2: '', diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue index 9994b5b..9c7dbf2 100644 --- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue @@ -26,7 +26,7 @@ /> - + - + + - + - + + +