From d8bd2cfe4260db15d89a36aaa51228ce3b4e7a44 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 1 May 2025 15:49:35 +0800 Subject: [PATCH 1/9] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=88=86=E9=85=8D=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 11 ++++++++--- .../wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index d14e0e636..50f0d5371 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -213,12 +213,17 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl() + .eq("task_type", "010911") + .eq("is_delete", "0") + .lt("task_status", TaskStatusEnum.FINISHED.getCode())); //检查是否满足二次分配条件 + if (count>0){ + throw new BadRequestException("正在执行行架任务"); + } checkTaskInfo(baseTask); //空载具缓存位特殊二次分配逻辑：先判断是否有执行中的行架任务或补空载具任务，如未完成，不分配点位 if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) || diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 6adeee7eb..5605e7b4f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1865,13 +1865,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用")) .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位")) .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空")) - .orderByAsc(BstIvtPackageinfoivt::getSort_seq)); + .orderByDesc(BstIvtPackageinfoivt::getSort_seq)); if (CollectionUtils.isEmpty(MzPoints)){ result.put("message", "满轴位无可用位置"); return result; } List empPoints = packageinfoivtService - .selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空")); + .selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具")); if (CollectionUtils.isEmpty(empPoints)){ result.put("message", "空轴位无可用位置"); return result; From ac007b6d84649854abb766b7bdacf375b8e1ebb3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Thu, 1 May 2025 15:51:19 +0800 Subject: [PATCH 2/9] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=89=A3=E5=87=8FFRP?= =?UTF-8?q?=E7=AE=A1=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MdPbPapervehicleServiceImpl.java | 3 ++- .../service/impl/SlitterServiceImpl.java | 26 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java index 61081e92b..2b699e074 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java @@ -68,7 +68,8 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl 0) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("vehicle_code", vehicleCode) - .eq("row_num", param.getString("row_num")) - .setSql("qty=qty-1"); - papervehicleService.update(updateWrapper); + //数量减一 + mdPbPapervehicle.setQty(BigDecimal.valueOf(mdPbPapervehicle.getQty().intValue()-1)); + + log.debug("更新后：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle); + // 检查更新后的 qty 是否为 0，然后删除相应的记录 - QueryWrapper deleteWrapper = new QueryWrapper<>(); - deleteWrapper.eq("vehicle_code", vehicleCode) - .eq("row_num", param.getString("row_num")) - .eq("qty", "0"); - boolean remove = papervehicleService.remove(deleteWrapper); + if(mdPbPapervehicle.getQty().intValue() <= 0){ + boolean remove = papervehicleService.removeById(mdPbPapervehicle); + log.debug("删除0结果：" + vehicleCode + ":" + remove); + }else{ + papervehicleService.update(mdPbPapervehicle); + } // todo: 如果qty=0，创建AGV送空任务，（新的task_type）、后期优化可以新增诺宝取货完成提前释放货位，任务状态变成071 // if (remove) { // hint: 错误 // // 证明删除成功，创建任务搬走 From e5a91484151dbca1bc85a2ccf6007e6d03d0dbd3 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 1 May 2025 18:16:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?opt:=E6=8E=92=E8=BF=87=E6=BB=A4=E5=8E=BB?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/util/wql/BST_INBOX.wql | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index 3218aaf1d..77967b71c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -156,7 +156,9 @@ AND attr.stor_id = 输入.stor_id AND attr.sect_id = 输入.sect_id AND attr.block_num = 输入.block_num - AND attr.row_num = 输入.row_num + OPTION 输入.row_num <> "" + AND attr.row_num = 输入.row_num + ENDOPTION AND attr.storagevehicle_type = 输入.vehicle_type AND attr.height = 输入.height order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC @@ -187,7 +189,9 @@ AND attr.stor_id = 输入.stor_id AND attr.sect_id = 输入.sect_id AND attr.block_num = 输入.block_num - AND attr.row_num = 输入.row_num + OPTION 输入.row_num <> "" + AND attr.row_num = 输入.row_num + ENDOPTION AND attr.storagevehicle_type = 输入.vehicle_type AND attr.height = 输入.height From 33a21088ad438fa986d7f4cab50ac2e1017f1c78 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 1 May 2025 19:23:00 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=E6=B7=B1=E8=B4=A7=E4=BD=8D=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/iostorInv/util/impl/InBoxManageServiceImpl.java | 1 + .../ios/service/iostorInv/util/wql/BST_INBOX.wql | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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 index a95692f3e..6876d59ed 100644 --- 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 @@ -974,6 +974,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { 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("row_num").equals(json.getString("row_num")) && row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("浅"))) .collect(Collectors.toList()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index 77967b71c..39528f7cc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -157,7 +157,7 @@ AND attr.sect_id = 输入.sect_id AND attr.block_num = 输入.block_num OPTION 输入.row_num <> "" - AND attr.row_num = 输入.row_num + attr.row_num = 输入.row_num ENDOPTION AND attr.storagevehicle_type = 输入.vehicle_type AND attr.height = 输入.height @@ -190,7 +190,7 @@ AND attr.sect_id = 输入.sect_id AND attr.block_num = 输入.block_num OPTION 输入.row_num <> "" - AND attr.row_num = 输入.row_num + attr.row_num = 输入.row_num ENDOPTION AND attr.storagevehicle_type = 输入.vehicle_type AND attr.height = 输入.height From ed3f39f071f8fab9fedac863136474809ffef235 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 2 May 2025 05:26:03 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E6=B7=B1=E8=B4=A7=E4=BD=8D=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 index 6876d59ed..5127a4e84 100644 --- 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 @@ -1003,6 +1003,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { List darkAttr = structAllList.stream() .filter(row -> row.getString("col_num").equals(json.getString("col_num")) && row.getString("layer_num").equals(json.getString("layer_num")) && + row.getString("row_num").equals(json.getString("row_num")) && row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) .collect(Collectors.toList()); From da57d8c3551e86c3cf937e37c6c8a20e030c7725 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 2 May 2025 12:13:01 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=E8=B4=A7=E4=BD=8D=E5=88=86=E9=85=8D?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=B8=A2=E5=A4=B1=EF=BC=9Bopt:=E4=B8=80?= =?UTF-8?q?=E6=A5=BC=E5=88=86=E9=85=8D=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BstIvtPackageinfoivtServiceImpl.java | 2 +- .../auto/AutoSendVehicleToKzj.java | 42 +++++++------------ .../util/impl/InBoxManageServiceImpl.java | 12 ++++-- .../acs/service/impl/AcsToWmsServiceImpl.java | 5 ++- .../src/main/resources/config/application.yml | 2 +- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 50f0d5371..4aded32fc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -156,11 +156,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl secondaryAllocationPoint(String taskCode, String actionType) { JSONObject result = new JSONObject(); result.put("status", HttpStatus.BAD_REQUEST.value()); RedissonUtils.lock(c-> { + try {Thread.sleep(1000);} catch (InterruptedException e) {} String pointCode = ""; String action = ""; switch (actionType) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index a0d296486..9e36dcf4f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -23,6 +23,9 @@ import org.nl.wms.sch.manage.TaskStatusEnum; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + import javax.annotation.Resource; import java.util.*; import java.util.concurrent.TimeUnit; @@ -71,38 +74,23 @@ public class AutoSendVehicleToKzj extends Prun{ boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); try { if (tryLock) { - JSONObject task = new JSONObject(); - String pointCode2; //todo 只允许2个补空任务,后期需要根据区域动态获取任务数量 - List taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"), PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"))); + List taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))); List existTask = taskService.getExistTasks(taskTypes); if (existTask.size() > 1) { return; } - List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("空载具放货"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); - //空载具缓存位预分配点 - if (ObjectUtils.isNotEmpty(kzjIvtList)) { - pointCode2 = kzjIvtList.get(0).getPoint_code(); - if (StringUtils.isBlank(pointCode2)) { - return; - } - } else { - return; - } - //存在补空的缓存位数量 - List packageinfoivtList = packageinfoivtService.getBstIvtPackageinfoivts(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), null,false); - task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); - task.put("point_code4", pointCode2); - task.put("point_code2", packageinfoivtService.getWaitPoint(kzjIvtList.get(0).getBlock(), kzjIvtList.get(0).getWait_point_type())); - if (packageinfoivtList.size() == 1) { - getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); - } else { - if (existTask.size() % 2 != 0) { - getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")); - } else { - //优先去待检区 - getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); - } + List empPoints = packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空")); + List vehiclePoints = packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具")); + if (!CollectionUtils.isEmpty(empPoints) && !CollectionUtils.isEmpty(vehiclePoints)){ + JSONObject task = new JSONObject(); + task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); + task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); + task.put("point_code1", vehiclePoints.get(0).getPoint_code()); + task.put("point_code2", packageinfoivtService.getWaitPoint(vehiclePoints.get(0).getBlock(), vehiclePoints.get(0).getWait_point_type())); + //预占用点位 + task.put("point_code3", empPoints.get(0).getPoint_code()); + djqToKzjhcwTask.createTask(task); } } else { log.info("待检区或管制区->空载具缓存位补空任务正在创建被锁住。"); 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 index 5127a4e84..5daa7876a 100644 --- 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 @@ -114,10 +114,12 @@ public class InBoxManageServiceImpl implements InBoxManageService { .eq("is_delete", "0") .orderByDesc("task_id") .last("limit 1")); - String vehicleCode2 = one.getVehicle_code2(); - if (whereJson.getString("vehicle_code").equals(vehicleCode2)){ - throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code()); - }; + if (one!=null){ + String vehicleCode2 = one.getVehicle_code2(); + if (whereJson.getString("vehicle_code").equals(vehicleCode2)){ + throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code()); + }; + } //查询仓库是否存在相同木箱 JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + boxNo + "'").getResultJSONArray(0); if (stIvtStructattr != null && stIvtStructattr.size() > 0) { @@ -736,6 +738,8 @@ public class InBoxManageServiceImpl implements InBoxManageService { json.put("box_length", jsonParam.getString("box_length")); json.put("box_width", jsonParam.getString("box_width")); json.put("box_high", jsonParam.getString("box_high")); + json.put("vehicle_type", jsonParam.getString("vehicle_type")); + json.put("height", jsonParam.getString("height")); String row_num_2 = getMinRow(json); json.put("row_num", row_num_2); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 5605e7b4f..0c316fe51 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1846,7 +1846,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * 二楼到一楼，成品子卷到达一楼输送线 */ @Override - @Transactional public JSONObject sendProductToFirstFloor(JSONObject whereJson) { log.info("sendProductToFirstFloor被调用--------------------------：" + whereJson.toString()); if (StringUtils.isBlank(whereJson.getString("device_code")) || StringUtils.isBlank(whereJson.getString("material_barcode"))) { @@ -1897,6 +1896,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { taskParam.put("is_send", true); mzhcwTask.createTask(taskParam); PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,null,Boolean.TRUE,null,whereJson.getString("material_barcode")); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + } result.put("status", HttpStatus.OK.value()); result.put("message", "反馈成功!"); return result; diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index a9fc87884..a435e1108 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: From a2d10682ef2ac155724edfb3dc32420721559b90 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 2 May 2025 12:19:08 +0800 Subject: [PATCH 7/9] =?UTF-8?q?opt:=E5=85=B3=E9=97=AD=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/common/utils/RedissonUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java index 218613268..127941c1b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java +++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java @@ -35,7 +35,6 @@ public class RedissonUtils { return; } }catch (Exception ex){ - ex.printStackTrace(); throw ex; }finally { if (isLock && lock.isHeldByCurrentThread()){ From 089193516a496f86a16bee11d7117ec469534543 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 2 May 2025 16:13:04 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=E6=9C=A8=E7=AE=B1=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=97=B6=E7=A7=BB=E5=BA=93=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=8C=E5=B7=B7=E9=81=93=E6=A0=A1=E9=AA=8C=EF=BC=9Bopt?= =?UTF-8?q?=EF=BC=9A=E5=AD=90=E5=8D=B7=E4=B8=8B=E5=85=88=E7=A9=BA=E6=B4=9E?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BstIvtPackageinfoivtMapper.java | 1 + .../dao/mapper/BstIvtPackageinfoivtMapper.xml | 10 ++++ .../service/IbstIvtPackageinfoivtService.java | 1 + .../impl/BstIvtPackageinfoivtServiceImpl.java | 8 +++ .../first_floor_area/DjqToKzjhcwTask.java | 20 -------- .../auto/AutoSendVehicleToKzj.java | 2 +- .../util/impl/InBoxManageServiceImpl.java | 51 +++++++++++++++++++ .../acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../src/main/resources/config/application.yml | 2 +- lms/nladmin-ui/.env.development | 4 +- 10 files changed, 76 insertions(+), 25 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java index 0aaafca03..57a11a602 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java @@ -36,4 +36,5 @@ public interface BstIvtPackageinfoivtMapper extends BaseMapper getTaskList(Set pointCodes1, Set pointCodes2, Set pointCodes3, Set pointCodes4); List selectNoTaskPoint(@Param("pointStatus") String pointStatus, @Param("ivtStatus")String ivtStatus); + List selectNoTargetTaskPoint(@Param("pointStatus") String pointStatus, @Param("ivtStatus")String ivtStatus); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml index 0641b191c..699c3b2c9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml @@ -91,5 +91,15 @@ AND t.is_delete = '0') + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java index 668b69266..6ab32e846 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java @@ -115,6 +115,7 @@ public interface IbstIvtPackageinfoivtService extends IService selectEmpPoints(String point_status,String ivt_status); + List selectNoTargetTaskPoints(String point_status,String ivt_status); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 4aded32fc..521ab4c6c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -1213,5 +1213,13 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl selectNoTargetTaskPoints(String point_status, String ivt_status) { + if (StringUtils.isEmpty(point_status)||StringUtils.isEmpty(ivt_status)){ + throw new BadRequestException("点位类型或状态不能为空"); + } + return this.baseMapper.selectNoTargetTaskPoint(point_status, ivt_status); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java index 6a9ee3f4e..48fd9d20b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java @@ -106,26 +106,6 @@ public class DjqToKzjhcwTask extends AbstractAcsTask { packageinfoivtService.update(null, new UpdateWrapper().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2())); //3.更改任务状态为完成 updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()); - //4.更新并清除预分配位 - exchangeTaskPoint(schBaseTask); - updateWrapper.set(SchBaseTask::getPoint_code4, ""); - //5.判断是否存在任务组任务 - packageinfoivtService.handleGroupTask(schBaseTask); - //6.待检区或管制区搬运空载具到空载具缓存位完毕，判断是否存在确定终点的空载具缓存位->输送线任务,存在就下发任务 - // List taskList = taskService.list(new LambdaQueryWrapper() - // //确定终点未下发 - // .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_END.getCode()) - // .eq(SchBaseTask::getPoint_code2, "NBJ1002") - // .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")).eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) - // ); - // if (ObjectUtils.isNotEmpty(taskList)) { - // SchBaseTask task = taskList.get(0); - // task.setPoint_code1(schBaseTask.getPoint_code2()); - // task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); - // taskService.update(task); - // //任务下发 - // ssxDjwTask.immediateNotifyAcs(task.getTask_id().toString()); - // } } // 取消 if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 9e36dcf4f..7f7baffb7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -87,7 +87,7 @@ public class AutoSendVehicleToKzj extends Prun{ task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); task.put("point_code1", vehiclePoints.get(0).getPoint_code()); - task.put("point_code2", packageinfoivtService.getWaitPoint(vehiclePoints.get(0).getBlock(), vehiclePoints.get(0).getWait_point_type())); + task.put("point_code2", packageinfoivtService.getWaitPoint(empPoints.get(0).getBlock(), empPoints.get(0).getWait_point_type())); //预占用点位 task.put("point_code3", empPoints.get(0).getPoint_code()); djqToKzjhcwTask.createTask(task); 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 index 5daa7876a..553d0cae8 100644 --- 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 @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.b_lms.sch.task.dao.SchBaseTask; @@ -719,6 +720,11 @@ public class InBoxManageServiceImpl implements InBoxManageService { jsonParam.put("row_num", row_num); JSONObject jsonAttr = queryStruct(jsonParam); + // 如果是移库空并且仓位为空则报错 + if (ObjectUtil.isNotEmpty(block_num) && ObjectUtil.isEmpty(jsonAttr)) { + throw new BadRequestException("转库任务巷道"+block_num+"仓位不足!"); + } + // 为空则新找巷道 if (ObjectUtil.isEmpty(jsonAttr)) { @@ -758,6 +764,51 @@ public class InBoxManageServiceImpl implements InBoxManageService { return jsonAttr; } + /** + * 同巷道移库查看库位 + * @param jsonParam + * @return + */ + public JSONObject getMoveStruct(JSONObject jsonParam) { + // 仓位表 + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + /* + * 判断是否有仓位 + * 判断条件：库区、仓库、是否启用、是否删除、未锁定、没有载具 + */ + String block_num = jsonParam.getString("move_block_num"); + if (StringUtils.isEmpty(block_num)){ + throw new BadRequestException("同巷道分配库位巷道参数不能为空"); + } + JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " + + "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + + "AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" + + "AND height = '" + jsonParam.getString("height") + "'" + + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " + + "AND sect_id = '" + jsonParam.getString("sect_id") + "' AND block_num = '" + block_num + "'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(structArray)) { + notInRowList.clear(); + notInBlockList.clear(); + throw new BadRequestException("仓位不足!"); + } + // 确定排：查看每排的木箱数量，找到数量最小的那排 + jsonParam.put("block_num", block_num); + String row_num = getMinRow(jsonParam); + + // 确定仓位： 找到仓位 + jsonParam.put("row_num", row_num); + JSONObject jsonAttr = queryStruct(jsonParam); + + // 为空则新找巷道 + if (ObjectUtil.isEmpty(jsonAttr)) { + throw new BadRequestException("当前巷道"+block_num+"没有可用库位"); + } + + notInRowList.clear(); + notInBlockList.clear(); + return jsonAttr; + } + /** * 确定巷道 * diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 0c316fe51..0e426b7be 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1870,7 +1870,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return result; } List empPoints = packageinfoivtService - .selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具")); + .selectNoTargetTaskPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具")); if (CollectionUtils.isEmpty(empPoints)){ result.put("message", "空轴位无可用位置"); return result; diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index a435e1108..a9fc87884 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development index 13c9fc5ce..79da18d26 100644 --- a/lms/nladmin-ui/.env.development +++ b/lms/nladmin-ui/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://10.1.3.91:8013' -VUE_APP_WS_API = 'ws://10.1.3.91:8013' +VUE_APP_BASE_API = 'http://127.0.0.1:8013' +VUE_APP_WS_API = 'ws://127.0.0.1:8013' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true From 3f00df76cf6e2962e998366391ec56e4aa3d4a20 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Fri, 2 May 2025 17:25:46 +0800 Subject: [PATCH 9/9] =?UTF-8?q?opt:=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9bom?= =?UTF-8?q?=E6=9C=A8=E7=AE=B1=E7=B1=BB=E5=9E=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BstIvtStockingivtController.java | 6 + .../service/IBstIvtStockingivtService.java | 3 + .../impl/BstIvtStockingivtServiceImpl.java | 12 ++ .../controller/MdpbBoxtypeController.java | 14 ++ .../database/service/IMdpbBoxtypeService.java | 6 + .../service/impl/MdpbBoxtypeServiceImpl.java | 24 ++++ .../bst/ivt/stockingivt/bstIvtStockingivt.js | 9 +- .../views/wms/basedata/st/boxType/boxtype.js | 17 ++- .../wms/pdm/order/slittingplan/index.vue | 21 ++- .../pdm/order/slittingplan/tubeDialog2.vue | 131 ++++++++++++++++++ 10 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java index db396471e..8a194adae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java @@ -80,5 +80,11 @@ public class BstIvtStockingivtController { return new ResponseEntity<>(bstIvtStockingivtService.showDetail2(param), HttpStatus.OK); } + @Log("查询bom记录") + @GetMapping("/showBom2") + public ResponseEntity showBom2(@RequestParam Map param) { + return new ResponseEntity<>(bstIvtStockingivtService.showBom2(param), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java index 55d688fe6..b987f4fff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto; import org.nl.common.domain.query.PageQuery; @@ -103,4 +104,6 @@ public interface IBstIvtStockingivtService extends IService { List> showDetail(JSONObject param); List showDetail2(Map param); + + PdmBiOrderbominfo showBom2(Map param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java index a8c88c889..7a5cd4630 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java @@ -15,6 +15,8 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper; import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; +import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto; @@ -52,6 +54,8 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { @@ -351,4 +355,12 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); + lam.eq(PdmBiOrderbominfo::getMfgOrder,mfg_order_name); + PdmBiOrderbominfo order = pdmBiOrderbominfoService.getOne(lam); + return order; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java index 69d5b43fc..6e2c15051 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java @@ -67,4 +67,18 @@ public class MdpbBoxtypeController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/confirmBox") + @Log("保存bom") + public ResponseEntity confirmBox(@RequestBody JSONObject whereJson) { + iMdpbBoxtypeService.confirmBox(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @GetMapping("/getBoxTypes") + @Log("查询木箱类型") + public ResponseEntity query(@RequestParam Map whereJson) { + return new ResponseEntity<>(iMdpbBoxtypeService.list(), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java index c211b48ee..f3131c7c7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java @@ -50,4 +50,10 @@ public interface IMdpbBoxtypeService extends IService { * @param whereJson： {需要修改的参数} */ void confirmUpdate(JSONObject whereJson); + + /** + * 一键修改 + * @param whereJson： {需要修改的参数} + */ + void confirmBox(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java index 5f663621d..935bbd16e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java @@ -9,11 +9,14 @@ 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; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; +import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbBoxtypeMapper; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,6 +34,8 @@ import java.util.Set; @Service public class MdpbBoxtypeServiceImpl extends ServiceImpl implements IMdpbBoxtypeService { + @Autowired + private IPdmBiOrderbominfoService pdmBiOrderbominfoService; @Override public IPage queryAll(Map whereJson, PageQuery page) { // 查询条件 @@ -81,4 +86,23 @@ public class MdpbBoxtypeServiceImpl extends ServiceImpl().lambda() + .eq(PdmBiOrderbominfo::getMfgOrder,whereJson.getString("mfgOrder")) + .set(PdmBiOrderbominfo::getProductName, whereJson.getString("productName")) + .set(PdmBiOrderbominfo::getDescription, boxtype.getBox_name()) + ); + } } diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js index 96ecd52c8..190917cac 100644 --- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js +++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js @@ -39,5 +39,12 @@ export function showDetail2(params) { params }) } +export function showBom2(params) { + return request({ + url: 'api/bstIvtStockingivt/showBom2', + method: 'get', + params + }) +} -export default { add, edit, del, showDetail, showDetail2 } +export default { add, edit, del, showDetail, showDetail2, showBom2 } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js index cdceb528e..b042aa4da 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js +++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js @@ -31,5 +31,18 @@ export function confirmUpdate(data) { data }) } - -export default { add, edit, del, confirmUpdate } +export function getBoxTypes(params) { + return request({ + url: 'api/boxtype/getBoxTypes', + method: 'get', + params + }) +} +export function confirmBox(data) { + return request({ + url: 'api/boxtype/confirmBox', + method: 'post', + data + }) +} +export default { add, edit, del, confirmUpdate, getBoxTypes, confirmBox } diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue index f4b77ed34..8ba8d664e 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -488,7 +488,11 @@ - + + + @@ -557,6 +561,7 @@ + @@ -565,8 +570,8 @@ import crudSlittingproductionplan from '@/views/wms/pdm/order/slittingplan/slitt import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' +import TubeDialog2 from '@/views/wms/pdm/order/slittingplan/tubeDialog2.vue' const defaultForm = { workorder_id: null, @@ -619,7 +624,7 @@ const defaultForm = { export default { name: 'Slittingproductionplan', dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'], - components: { pagination, crudOperation, rrOperation, udOperation }, + components: { pagination, crudOperation, rrOperation, TubeDialog2 }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -640,6 +645,8 @@ export default { data() { return { permission: {}, + showView2: false, + mstrow: {}, rules: { order_type: [ { required: true, message: '分切订单类型不能为空', trigger: 'blur' } @@ -679,6 +686,14 @@ export default { hand() { this.crud.toQuery() }, + toView2(index, row) { + this.showView2 = true + this.mstrow = row + }, + querytable() { + this.$refs.table.clearSelection() + this.crud.toQuery() + }, upMaterFinish() { const _selectData = this.$refs.table.selection const data = { diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue new file mode 100644 index 000000000..8a84a1ab0 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue @@ -0,0 +1,131 @@ + + + + +