From b0ac44072ae0c1e26938867f12c4d21acdc4f746 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 26 Jan 2024 18:04:38 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=A9=BA=E6=89=98=E7=9B=98?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoOutEmpTask.java | 181 ++++++++ .../util/impl/InBussManageServiceImpl.java | 9 + ...l.java => InVehicleManageServiceImpl.java} | 24 +- .../impl/OutVehicleManageServiceImpl.java | 388 ++++++++++++++++++ ...rvice.java => InVehicleManageService.java} | 3 +- .../util/service/OutVehicleManageService.java | 24 ++ .../iostorInv/util/wql/BST_OUTVEHICLE.wql | 37 +- .../outbill/rest/CheckOutBillController.java | 15 +- 8 files changed, 669 insertions(+), 12 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java rename lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/{VehicleManageServiceImpl.java => InVehicleManageServiceImpl.java} (95%) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java rename lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/{VehicleManageService.java => InVehicleManageService.java} (92%) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java new file mode 100644 index 000000000..5110019c8 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java @@ -0,0 +1,181 @@ +package org.nl.b_lms.sch.tasks; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.sch.AcsTaskDto; +import org.nl.wms.sch.manage.AbstractAcsTask; +import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 二期空托盘出库任务类 + * Created by Lxy on 2024/1/19. + */ +public class TwoOutEmpTask extends AbstractAcsTask { + + /** + * 处理类 + */ + private final String THIS_CLASS = TwoOutEmpTask.class.getName(); + + @Override + public List addTask() { + /* + * 下发给ACS时需要特殊处理 + */ + JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); + + ArrayList resultList = new ArrayList<>(); + for (int i = 0; i < arr.size(); i++) { + JSONObject json = arr.getJSONObject(i); + + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(json.getString("task_id")) + .task_code(json.getString("task_code")) + .task_type(json.getString("acs_task_type")) + .start_device_code(json.getString("point_code1")) + .next_device_code(json.getString("point_code2")) + .vehicle_code(json.getString("vehicle_code")) + .priority(json.getString("priority")) + .class_type(json.getString("task_type")) + .dtl_type(String.valueOf(dtl_type)) + .remark(json.getString("remark")) + .build(); + resultList.add(dto); + } + return resultList; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateTaskStatus(JSONObject taskObj, String status) { + + // 仓位表 + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + // 更新任务的参数 + JSONObject map = new JSONObject(); + + /* + * 1-执行中, 2-完成 ,0-acs取消 + */ + // 执行中 + if (status.equals(TaskStatusEnum.EXECUTING.getCode())) { + + map.put("task_status", TaskStatusEnum.EXECUTING.getCode()); + } + + // 完成 + if (status.equals(TaskStatusEnum.FINISHED.getCode())) { + + map.put("task_status", TaskStatusEnum.FINISHED.getCode()); + + // 更新仓位 + JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0); + jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定")); + jsonAttr.put("storagevehicle_code",""); + jsonAttr.put("storagevehicle_type",""); + attrTab.update(jsonAttr); + } + + // 取消 + if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { + + if (taskObj.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.ISSUE.getCode())) { + throw new BadRequestException("任务已执行不能取消"); + } + + // 更新任务表删除字段 + map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是")); + + // 解锁仓位 + JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0); + jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定")); + attrTab.update(jsonAttr); + } + + map.put("update_optid", SecurityUtils.getCurrentUserId()); + map.put("update_optname", SecurityUtils.getCurrentNickName()); + map.put("update_time", DateUtil.now()); + + WQLObject.getWQLObject("SCH_BASE_Task").update(map, "task_id = '" + taskObj.getString("task_id") + "'"); + } + + @Override + public void findStartPoint() { + + } + + @Override + public void findNextPoint() { + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public String createTask(JSONObject form) { + + if (StrUtil.isBlank(form.getString("task_type"))) { + throw new BadRequestException("业务类型不能为空!"); + } + + if (StrUtil.isBlank(form.getString("start_device_code"))) { + throw new BadRequestException("起点不能为空!"); + } + + if (StrUtil.isBlank(form.getString("next_device_code"))) { + throw new BadRequestException("终点不能为空!"); + } + + if (StrUtil.isBlank(form.getString("vehicle_code"))) { + throw new BadRequestException("托盘号不能为空!"); + } + + if (StrUtil.isBlank(form.getString("vehicle_type"))) { + throw new BadRequestException("托盘类型不能为空!"); + } + + JSONObject json = new JSONObject(); + json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); + json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); + json.put("task_type", form.getString("task_type")); + json.put("vehicle_code", form.getString("vehicle_code")); + json.put("vehicle_type", form.getString("vehicle_type")); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + json.put("point_code1", form.getString("start_device_code")); + json.put("point_code2", form.getString("next_device_code")); + json.put("handle_class", this.getClass().getName()); + json.put("create_id", SecurityUtils.getCurrentUserId()); + json.put("create_name", SecurityUtils.getCurrentUsername()); + json.put("create_time", DateUtil.now()); + json.put("priority", "1"); + json.put("acs_task_type", "7"); + + WQLObject.getWQLObject("SCH_BASE_Task").insert(json); + return json.getString("task_id"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void forceFinish(String task_id) { + JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } + + @Override + public void cancel(String task_id) { + JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); + this.updateTaskStatus(taskObj, IOSEnum.ACS_RESULT.code("取消")); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index 717d46258..908cfe1ed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -88,6 +88,8 @@ public class InBussManageServiceImpl implements InBussManageService { "AND sect_id = '"+jsonObject.getString("sect_id")+"'").getResultJSONArray(0); if (ObjectUtil.isEmpty(attrArry)) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位不足!"); } @@ -148,6 +150,9 @@ public class InBussManageServiceImpl implements InBussManageService { } } + // 清空缓存 + notInRowList.clear(); + notInBlockList.clear(); return jsonAttr; } @@ -428,6 +433,8 @@ public class InBussManageServiceImpl implements InBussManageService { .collect(Collectors.toList()); if (ObjectUtil.isEmpty(lowAttr) || lowAttr.size() != 1) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位:" + json.getString("struct_code") + "对应的浅货位错误!"); } @@ -452,6 +459,8 @@ public class InBussManageServiceImpl implements InBussManageService { .collect(Collectors.toList()); if (ObjectUtil.isEmpty(darkAttr) || darkAttr.size() != 1) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位:" + json.getString("struct_code") + "对应的深货位错误!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/VehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java similarity index 95% rename from lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/VehicleManageServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java index 59635cd25..8051f477b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/VehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.sch.tasks.TwoInEmpTask; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; -import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.VehicleManageService; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InVehicleManageService; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -27,15 +27,15 @@ import java.util.stream.Collectors; * @since 2023-11-10 */ @Service -public class VehicleManageServiceImpl implements VehicleManageService { +public class InVehicleManageServiceImpl implements InVehicleManageService { /** - * 不需要查询的排集合 + * 入库不需要查询的排集合 */ private List notInRowList = new ArrayList<>(); /** - * 不需要查询的巷道集合 + * 入库不需要查询的巷道集合 */ private List notInBlockList = new ArrayList<>(); @@ -66,6 +66,8 @@ public class VehicleManageServiceImpl implements VehicleManageService { JSONObject jsonAttr = getStruct(jsonParam); if (ObjectUtil.isEmpty(jsonAttr)) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位不足!"); } @@ -85,6 +87,10 @@ public class VehicleManageServiceImpl implements VehicleManageService { // 锁定终点 jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("空托盘入库锁")); attrTab.update(jsonAttr); + + // 清空缓存 + notInRowList.clear(); + notInBlockList.clear(); } /** @@ -92,6 +98,7 @@ public class VehicleManageServiceImpl implements VehicleManageService { * @param jsonParam { * stor_id: 仓库标识 * sect_id: 库区标识 + * vehicle_type: 载具类型 * } * @return JSONObject ： 仓位对象 */ @@ -109,6 +116,8 @@ public class VehicleManageServiceImpl implements VehicleManageService { "AND sect_id = '"+jsonParam.getString("sect_id")+"'").getResultJSONArray(0); if (ObjectUtil.isEmpty(structArray)) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位不足!"); } @@ -306,7 +315,7 @@ public class VehicleManageServiceImpl implements VehicleManageService { String row_num_new = this.getMinRow(jsonParam); jsonParam.put("row_num",row_num_new); - jsonAttr = this.getStruct(jsonParam); + jsonAttr = this.getStructOne(jsonParam); } return jsonAttr; } @@ -360,6 +369,8 @@ public class VehicleManageServiceImpl implements VehicleManageService { .collect(Collectors.toList()); if (ObjectUtil.isEmpty(lowAttr) || lowAttr.size() != 1) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位:" + json.getString("struct_code") + "对应的浅货位错误!"); } @@ -386,6 +397,8 @@ public class VehicleManageServiceImpl implements VehicleManageService { .collect(Collectors.toList()); if (ObjectUtil.isEmpty(darkAttr) || darkAttr.size() != 1) { + notInRowList.clear(); + notInBlockList.clear(); throw new BadRequestException("仓位:" + json.getString("struct_code") + "对应的深货位错误!"); } @@ -419,4 +432,5 @@ public class VehicleManageServiceImpl implements VehicleManageService { } return jsonAttr; } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java new file mode 100644 index 000000000..6c545fe6d --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java @@ -0,0 +1,388 @@ +package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.b_lms.sch.tasks.TwoInEmpTask; +import org.nl.b_lms.sch.tasks.TwoOutEmpTask; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InVehicleManageService; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutVehicleManageService; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.pda.mps.eum.RegionTypeEnum; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +/** + *

+ * 空载具业务处理 服务实现类 + *

+ * + * @author generator + * @since 2023-11-10 + */ +@Service +public class OutVehicleManageServiceImpl implements OutVehicleManageService { + + /** + * 出库不需要查询的排集合 + */ + private List notOutRowList = new ArrayList<>(); + + /** + * 出库不需要查询的巷道集合 + */ + private List notOutBlockList = new ArrayList<>(); + + @Override + @Transactional + public void outVehicle(JSONObject whereJson) { + /* + * 1.找到相同托盘类型的最多的巷道 + * 2.找到相同托盘类型的最多排 + * 3.确定仓位 + */ + // 点位表 + WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + // 仓位表 + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期")); + whereJson.put("sect_id", RegionTypeEnum.TWO_TTP01.getId()); + whereJson.put("storagevehicle_type", whereJson.getString("vehicle_type")); + + // 判断起点点位是否存在 + JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + + IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" + + IOSEnum.IS_NOTANDYES.code("是") + "'") + .uniqueResult(0); + + if (ObjectUtil.isEmpty(jsonPoint)) { + throw new BadRequestException("终点点位不存在或未启用!"); + } + + JSONObject jsonAttr = getStruct(whereJson); + + if (ObjectUtil.isEmpty(jsonAttr)) { + notOutRowList.clear(); + notOutBlockList.clear(); + throw new BadRequestException("仓位不足!"); + } + + // 生成任务 + JSONObject jsonTaskParam = new JSONObject(); + jsonTaskParam.put("task_type", "010504"); + jsonTaskParam.put("start_device_code", jsonAttr.getString("struct_code")); + jsonTaskParam.put("next_device_code", whereJson.getString("device_code")); + jsonTaskParam.put("vehicle_code", jsonAttr.getString("storagevehicle_type")); + jsonTaskParam.put("vehicle_type", whereJson.getString("vehicle_type")); + + TwoOutEmpTask taskBean = new TwoOutEmpTask(); + taskBean.createTask(jsonTaskParam); + taskBean.immediateNotifyAcs(null); + + // 锁定终点 + jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("空托盘出库锁")); + attrTab.update(jsonAttr); + + // 清空缓存 + notOutRowList.clear(); + notOutBlockList.clear(); + } + /** + * 找一个空托盘（空托盘区） + * @param whereJson { + * stor_id: 仓库标识 + * sect_id: 库区标识 + * storagevehicle_type: 载具类型 + * } + * @return JSONObject ： 仓位对象 + */ + private JSONObject getStruct(JSONObject whereJson) { + // 仓位表 + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + /* + * 判断是否有相同类型的托盘 + * 判断条件：库区、仓库、是否启用、是否删除、未锁定、有载具、相同载具类型 + */ + JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') <> '' " + + "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '"+whereJson.getString("stor_id")+"' " + + "AND sect_id = '"+whereJson.getString("sect_id")+"' AND storagevehicle_type = '"+whereJson.getString("storagevehicle_type")+"'").getResultJSONArray(0); + + if (ObjectUtil.isEmpty(structArray)) { + notOutRowList.clear(); + notOutBlockList.clear(); + throw new BadRequestException("没有相同托盘类型的库存!"); + } + + // 确定巷道：找相同托盘类型的最多的巷道 + String block_num = getMaxBlock(whereJson); + + // 确定排：找某一巷道相同托盘类型的最多排 + whereJson.put("block_num", block_num); + String row_num = getMaxRow(whereJson); + + // 确定仓位 + whereJson.put("row_num", row_num); + JSONObject jsonAttr = getVehicle(whereJson); + + // 为空则新找巷道 + if (ObjectUtil.isEmpty(jsonAttr)) { + + whereJson.put("flag", "1"); + notOutBlockList.add(whereJson.getString("block_num")); + + String join = "('" + String.join("','", notOutBlockList) + "')"; + whereJson.put("not_block_id", join); + + List blockList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + for (int i = 0; i < blockList.size(); i++) { + JSONObject json = blockList.get(i); + json.put("stor_id", whereJson.getString("stor_id")); + json.put("sect_id", whereJson.getString("sect_id")); + json.put("storagevehicle_type", whereJson.getString("vehicle_type")); + + + String row_num_2 = getMaxRow(json); + json.put("row_num",row_num_2); + JSONObject jsonAttr_2 = getVehicle(json); + + if (ObjectUtil.isNotEmpty(jsonAttr_2)) { + jsonAttr = jsonAttr_2; + } else { + continue; + } + } + } + return jsonAttr; + } + + /** + * 找一个空托盘 + * @param whereJson： { + * stor_id：仓库标识 + * sect_id：库区标识 + * vehicle_type： 托盘类型 + * block_num： 巷道 + * row_num： 排 + * } + * @return JSONObject： 需要出库的托盘盘 + */ + private JSONObject getVehicle(JSONObject whereJson) { + + // 确定仓位：找一个未锁定的空载具 + JSONObject jsonAttr = getVehicleOne(whereJson); + + // 为空找此巷道新的一排 + if (ObjectUtil.isEmpty(jsonAttr)) { + notOutRowList.add(whereJson.getString("row_num")); + + String join = "('" + String.join("','", notOutRowList) + "')"; + whereJson.put("not_row_in", join); + + // 新的一排 + String row_num_new = this.getMaxRow(whereJson); + whereJson.put("row_num",row_num_new); + + jsonAttr = this.getVehicleOne(whereJson); + } + + return jsonAttr; + } + + /** + * 找到相同托盘类型最多的巷道 + * @param whereJson： { + * stor_id：仓库标识 + * sect_id：库区标识 + * storagevehicle_type： 托盘类型 + * } + * @return String： 巷道 + */ + private String getMaxBlock(JSONObject whereJson) { + whereJson.put("flag", "1"); + + // 查询所有相同载具类型的巷道集合 + List allBlockList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + if (ObjectUtil.isEmpty(allBlockList)) { + notOutRowList.clear(); + notOutBlockList.clear(); + throw new BadRequestException("没有相同类型的空托盘库存!"); + } + + // 查询所有相同托盘类型巷道的仓位 + String block_num_in = allBlockList.stream() + .map(row -> row.getString("block_num")) + .collect(Collectors.joining("','")); + + whereJson.put("flag", "2"); + whereJson.put("block_num_in", "('"+block_num_in+"')"); + + List likeAttrList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + // 计算每个巷道的数量 + ArrayList blockVehicleList = new ArrayList<>(); + + for (int i = 0; i < allBlockList.size(); i++) { + JSONObject jsonBlock = allBlockList.get(i); + + List blockAttrNum = likeAttrList.stream() + .filter(row -> row.getString("block_num").equals(jsonBlock.getString("block_num"))) + .collect(Collectors.toList()); + + jsonBlock.put("vehicle_num", String.valueOf(blockAttrNum.size())); + blockVehicleList.add(jsonBlock); + } + + // 最大托盘数的巷道 + List boxNumList = blockVehicleList.stream() + .sorted(Comparator.comparing(row -> row.getString("vehicle_num"))) + .collect(Collectors.toList()); + + String block_num = ""; + if (ObjectUtil.isNotEmpty(boxNumList)) { + block_num = boxNumList.get(boxNumList.size() - 1).getString("block_num"); + } + + return block_num ; + } + + /** + * 找到某一巷道相同托盘类型最多的排 + * @param whereJson： { + * stor_id：仓库标识 + * sect_id：库区标识 + * storagevehicle_type： 托盘类型 + * block_num： 巷道 + * } + * @return String： 排 + */ + private String getMaxRow(JSONObject whereJson) { + whereJson.put("flag", "3"); + + // 查询所有某一巷道相同载具类型的排集合 + List allRowList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + // 查询某一巷道所有相同托盘类型排的仓位 + String row_num_in = allRowList.stream() + .map(row -> row.getString("row_num")) + .collect(Collectors.joining("','")); + + whereJson.put("flag", "2"); + whereJson.put("row_num_in", "('"+row_num_in+"')"); + + List likeAttrList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + // 计算每个排的数量 + ArrayList blockVehicleList = new ArrayList<>(); + + for (int i = 0; i < allRowList.size(); i++) { + JSONObject jsonRow = allRowList.get(i); + + List blockAttrNum = likeAttrList.stream() + .filter(row -> row.getString("row_num").equals(jsonRow.getString("row_num"))) + .collect(Collectors.toList()); + + jsonRow.put("vehicle_num", String.valueOf(blockAttrNum.size())); + blockVehicleList.add(jsonRow); + } + + // 最大托盘数的排 + List boxNumList = blockVehicleList.stream() + .sorted(Comparator.comparing(row -> row.getString("vehicle_num"))) + .collect(Collectors.toList()); + + String row_num = ""; + if (ObjectUtil.isNotEmpty(boxNumList)) { + row_num = boxNumList.get(boxNumList.size() - 1).getString("row_num"); + } + + return row_num; + } + + /** + * 确定巷道、确定排，找一个空托盘 + * @param whereJson： { + * stor_id：仓库标识 + * sect_id：库区标识 + * storagevehicle_type： 托盘类型 + * block_num： 巷道 + * row_num： 排 + * } + * @return JSONObject： 空托盘 + */ + private JSONObject getVehicleOne(JSONObject whereJson) { + + // 查相同托盘类型某一巷道某一排的所有托盘 + whereJson.put("flag", "4"); + + List allAttrList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + // 获取此仓库、库区、巷道、排的所有仓位 + whereJson.put("flag", "5"); + + List structAllList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + + JSONObject jsonAttr = new JSONObject(); + + // 确定仓位 + for (int i = 0; i < allAttrList.size(); i++) { + JSONObject json = allAttrList.get(i); + + if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("无"))) { + jsonAttr = json; + break; + } else if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) { + /* + * 深货位： 判断浅货位是否被锁定 + */ + // 获取此货位对应的浅货位 + List lowAttr = structAllList.stream() + .filter(row -> row.getString("col_num").equals(json.getString("col_num")) && + row.getString("layer_num").equals(json.getString("layer_num")) && + row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("浅"))) + .collect(Collectors.toList()); + + if (ObjectUtil.isEmpty(lowAttr) || lowAttr.size() != 1) { + notOutRowList.clear(); + notOutBlockList.clear(); + throw new BadRequestException("仓位:" + json.getString("struct_code") + "对应的浅货位错误!"); + } + + if (lowAttr.get(0).getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) { + jsonAttr = json; + break; + } else { + continue; + } + } else if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("浅"))) { + /* + * 浅货位： 直接出 + */ + jsonAttr = json; + break; + } + + } + + return jsonAttr; + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/VehicleManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InVehicleManageService.java similarity index 92% rename from lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/VehicleManageService.java rename to lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InVehicleManageService.java index 6e31452e4..0b2ccba54 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/VehicleManageService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InVehicleManageService.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONObject; * @author generator * @since 2023-11-16 */ -public interface VehicleManageService { +public interface InVehicleManageService { /** * 入空载具 @@ -22,5 +22,4 @@ public interface VehicleManageService { */ void inVehicle(JSONObject whereJson); - } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java new file mode 100644 index 000000000..a1c2b0aca --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java @@ -0,0 +1,24 @@ +package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service; + +import com.alibaba.fastjson.JSONObject; + +/** + *

+ * 空载具业务处理 服务类 + *

+ * + * @author generator + * @since 2023-11-16 + */ +public interface OutVehicleManageService { + + /** + * 出空载具 + * @param whereJson { + * device_code：终点 + * vehicle_type： 托盘类型 + * } + */ + void outVehicle(JSONObject whereJson); + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql index e27cb5201..b8b81a94a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql @@ -18,8 +18,11 @@ 输入.sect_id TYPEAS s_string 输入.storagevehicle_type TYPEAS s_string 输入.block_num TYPEAS s_string + 输入.row_num TYPEAS s_string 输入.block_num_in TYPEAS f_string 输入.row_num_in TYPEAS f_string + 输入.not_row_in TYPEAS f_string + 输入.not_block_id TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -61,6 +64,10 @@ attr.storagevehicle_type = 输入.storagevehicle_type ENDOPTION + OPTION 输入.not_block_id <> "" + attr.block_num not in = 输入.not_block_id + ENDOPTION + group by attr.block_num order by attr.block_num @@ -124,6 +131,10 @@ attr.block_num = 输入.block_num ENDOPTION + OPTION 输入.not_row_in <> "" + attr.row_num not in 输入.not_row_in + ENDOPTION + group by attr.row_num order by attr.row_num @@ -157,8 +168,32 @@ attr.row_num = 输入.row_num ENDOPTION - order by attr.col_numv, attr.zdepth + order by attr.col_num, attr.zdepth ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + attr.* + FROM + st_ivt_structattr attr + WHERE + attr.is_used = '1' + AND attr.is_delete = '0' + AND attr.stor_id = 输入.stor_id + AND attr.sect_id = 输入.sect_id + + OPTION 输入.block_num <> "" + attr.block_num = 输入.block_num + ENDOPTION + + OPTION 输入.row_num <> "" + attr.row_num = 输入.row_num + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index 9b2bdb037..97e9a51bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -5,7 +5,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService; -import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.VehicleManageServiceImpl; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.InVehicleManageServiceImpl; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.OutVehicleManageServiceImpl; import org.nl.modules.logging.annotation.Log; import org.nl.wms.st.inbill.service.CheckOutBillService; import org.springframework.beans.factory.annotation.Autowired; @@ -363,10 +364,16 @@ public class CheckOutBillController { @PostMapping("/testInEmp") - @Log("销售出库回传mes") - + @Log("空载具入库测试") public ResponseEntity testInEmp(@RequestBody JSONObject whereJson) { - new VehicleManageServiceImpl().inVehicle(whereJson); + new InVehicleManageServiceImpl().inVehicle(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/testOutEmp") + @Log("空载具出库测试") + public ResponseEntity testOutEmp(@RequestBody JSONObject whereJson) { + new OutVehicleManageServiceImpl().outVehicle(whereJson); return new ResponseEntity<>(HttpStatus.OK); }