From 1018b1fac0ac0b4d2e6541c6523b607a4cd542c8 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 27 Jan 2024 15:53:15 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=A9=BA=E6=89=98=E7=9B=98?= =?UTF-8?q?=E5=87=BA=E5=85=A5=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 | 2 +- .../util/impl/InBoxManageServiceImpl.java | 22 +++++++++++++++ .../impl/OutVehicleManageServiceImpl.java | 4 +++ .../util/service/InBoxManageService.java | 28 +++++++++++++++++++ .../views/wms/basedata/st/struct/index.vue | 12 +++++++- 5 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.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 index 5110019c8..bab8eb583 100644 --- 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 @@ -82,7 +82,7 @@ public class TwoOutEmpTask extends AbstractAcsTask { map.put("task_status", TaskStatusEnum.FINISHED.getCode()); // 更新仓位 - JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0); + JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0); jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定")); jsonAttr.put("storagevehicle_code",""); jsonAttr.put("storagevehicle_type",""); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java new file mode 100644 index 000000000..df37240eb --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -0,0 +1,22 @@ +package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; + +import com.alibaba.fastjson.JSONObject; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBoxManageService; +import org.springframework.stereotype.Service; + +/** + *

+ * 木箱入库业务处理 服务实现类 + *

+ * + * @author generator + * @since 2023-11-10 + */ +@Service +public class InBoxManageServiceImpl implements InBoxManageService { + + @Override + public void inBox(JSONObject whereJson) { + + } +} 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 index 6c545fe6d..2d7c882a8 100644 --- 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 @@ -278,6 +278,10 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService { List allRowList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson) .process().getResultJSONArray(0).toJavaList(JSONObject.class); + if (ObjectUtil.isEmpty(allRowList)) { + throw new BadRequestException("请当前排列任务执行完后在试!"); + } + // 查询某一巷道所有相同托盘类型排的仓位 String row_num_in = allRowList.stream() .map(row -> row.getString("row_num")) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java new file mode 100644 index 000000000..e5750f997 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java @@ -0,0 +1,28 @@ +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 InBoxManageService { + + /** + * 木箱入库 + * @param whereJson：{ + * box_no： 木箱号 + * vehicle_code：托盘号 + * device_code：起点点位 + * box_length：木箱长度 + * box_width：木箱宽度 + * box_high：木箱高度 + * } + */ + void inBox(JSONObject whereJson); + +} diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue index be120c759..70cc19381 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue @@ -228,6 +228,16 @@ {{ dict.label.placement_type[scope.row.placement_type] }} + + + + + +