From 087d719036280c69ffd7191fc19d703d972900b2 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sat, 27 Jan 2024 17:14:17 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=B5=B7=E6=9F=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/AcsTaskEnum.java | 1 + .../acs/service/impl/WmsToAcsServiceImpl.java | 7 +++++-- .../dao/mapper/MdMeMaterialbaseMapper.xml | 3 +++ .../MdPbStoragevehicleinfoServiceImpl.java | 8 ++++++- .../task/impl/SchBaseTaskServiceImpl.java | 12 +++++++++-- .../StIvtIostorinvHrBcpInServiceImpl.java | 18 ++++++++++------ .../StIvtIostorinvHrBcpOutServiceImpl.java | 21 ++++++++----------- .../impl/StIvtMoveinvHrBcpServiceImpl.java | 4 ++-- 8 files changed, 49 insertions(+), 25 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 10a64b19..7bbf3a2d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -80,6 +80,7 @@ public enum AcsTaskEnum { ///api/dict/dictDetail/api/dict/dictDetail/api/dict/dictDetail AGV_SYSTEM_NB("1","诺宝机器人任务"), AGV_SYSTEM_XC("2","叉车任务"), + AGV_SYSTEM_HR("3","海柔任务"), ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java index 610eddcb..6b99a85f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.AcsUtil; import org.nl.common.utils.IdUtil; @@ -137,6 +138,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ @Override public Map issueTaskToAcs4(JSONArray arr) { + String HR_TASK_TYPE = "18"; JSONArray form = new JSONArray(); for (Object o : arr) { JSONObject task = (JSONObject) o; @@ -148,13 +150,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ , "task_group_id", task.getString("task_group_id") , "start_point_code", task.getString("point_code1") , "next_point_code", task.getString("point_code3") - , "task_type", "18" + , "task_type", HR_TASK_TYPE , "storage_task_type", task.getString("acs_task_type") , "task_group_id", StringUtils.isBlank(task.getString("task_group_id"))? IdUtil.getStringId():task.getString("task_group_id") , "priority", task.getString("priority") , "is_send", task.getBoolean("is_send")?"1":"0" , "vehicle_code", task.getString("vehicle_code") - , "agv_system_type", task.getString("agv_system_type") + , "agv_system_type", AcsTaskEnum.AGV_SYSTEM_HR.getCode() + , "acs", "A3_acs_url" )); form.add(param); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml index 641a2f40..6d949e5f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml @@ -18,6 +18,9 @@ mater.material_name LIKE '%${query.material_code}%' or mater.material_spec LIKE '%${query.material_code}%') + + AND mater.product_area = #{query.product_area} + order by mater.material_code ASC diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java index 74059904..b2f2a84b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -90,6 +90,9 @@ public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl() .eq("material_code", vorm.getString("material_code")) - .eq("is_delete",false)); + .eq("is_delete",false)); if (one==null){ throw new BadRequestException("当前物料编号不存在:"+vorm.getString("material_code")); } @@ -208,6 +211,9 @@ public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl map = new HashMap<>(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java index ed228917..d05d57bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java @@ -20,6 +20,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.ext_manage.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask; import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum; @@ -166,7 +167,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl result = WmsToAcsServiceImpl.staticIssueTaskToAcs(array); + Map result; + if (task.getProduct_area().equals("A3")){ + WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class); + result = bean.issueTaskToAcs4(array); + }else { + result = WmsToAcsServiceImpl.staticIssueTaskToAcs(array); + } + String status = String.valueOf(result.get("status")); if (!status.equals("200")) { throw new BadRequestException(result.get("message") != null ? String.valueOf(result.get("message")) : "acs反馈异常"); @@ -215,7 +223,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl() + .eq("bar_code",mst.getStoragevehicle_code())); return null; } @@ -455,6 +458,7 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl().lambda() .eq(StIvtIostorinvOrder::getIn_device, device_code) .eq(StIvtIostorinvOrder::getBar_code, barcode) + .eq(StIvtIostorinvOrder::getIs_delete, false) .eq(StIvtIostorinvOrder::getType, IOSEnum.IO_TYPE.code("入库")) .orderByDesc(StIvtIostorinvOrder::getCreate_time) , false @@ -505,11 +509,13 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl().lambda() - .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) - .eq(StIvtStructattr::getStruct_id, mstDao.getStruct_id()) - ); + if (mstDao !=null){ + structattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .eq(StIvtStructattr::getStruct_id, mstDao.getStruct_id()) + ); + } // 删除任务 iSchBaseTaskService.update( diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java index 8749162b..655afe3d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java @@ -239,9 +239,6 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code()) ); - if (StringUtils.isNotEmpty(mst.getStoragevehicle_code())){ - iStIvtIostorinvOrderService.remove(new QueryWrapper().eq("bar_code",mst.getStoragevehicle_code())); - } // 插入出入库顺序表 StIvtIostorinvOrder dao = new StIvtIostorinvOrder(); @@ -308,16 +305,16 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl { - MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper().eq("material_id", form.getString("material_id"))); - JSONObject param = new JSONObject(); - param.put("stor_id", form.getString("stor_id")); - param.put("sect_id", form.getString("sect_id")); - param.put("material_id", form.getString("material_id")); - param.put("rule_type", RuleUtil.PRODUCTION_OUT_2); - // 2.锁定仓位 + MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper().eq("material_id", form.getString("material_id"))); + JSONObject param = new JSONObject(); + param.put("stor_id", form.getString("stor_id")); + param.put("sect_id", form.getString("sect_id")); + param.put("material_id", form.getString("material_id")); + param.put("rule_type", RuleUtil.PRODUCTION_OUT_2); + // 2.锁定仓位 StIvtStructivtBcp stIvtStructivtBcp; if (form.get("stIvtStructivt")==null){ - stIvtStructivtBcp = divRuleCpService.divRuleOutBcp(param); + stIvtStructivtBcp = divRuleCpService.divRuleOutBcp(param); }else { stIvtStructivtBcp=(StIvtStructivtBcp)form.get("stIvtStructivt"); } @@ -445,7 +442,7 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl().lambda() - .eq(SchBaseTask::getTask_id, form.getString("task_id")) - .set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode()) + .eq(SchBaseTask::getTask_id, form.getString("task_id")) + .set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode()) ); break;