From d9cff93a1140ab3d5a30a5059c2252c58c3ecc9a Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 9 Jul 2024 15:21:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99?= =?UTF-8?q?=E5=8E=BB=E9=99=A4B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 1 + .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index 8de13ae16..315efbd33 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -27,6 +27,7 @@ FROM `bst_ivt_cutpointivt` bct WHERE bct.point_type = '3' AND bct.point_status = '3' + AND bct.product_area = 'B2' AND bct.is_used = '1' AND 0 = (SELECT COUNT(*) FROM sch_base_task t diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 8eca237ac..732acd994 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -445,7 +445,7 @@ public class SlitterServiceImpl implements SlitterService { public JSONObject mesSlittingMachineSendMaterial(JSONObject param) { log.info("分切机下料的输入参数为：{}", param); JSONObject res = new JSONObject(); - // todo: 获取子卷号数组 + // 获取子卷号数组 JSONArray containers = param.getJSONArray("container"); List containerList = containers.toJavaList(String.class); if (containerList.size() == 0) { @@ -955,7 +955,7 @@ public class SlitterServiceImpl implements SlitterService { try { openLock = open.tryLock(0, TimeUnit.SECONDS); } catch (InterruptedException e) { - throw new RuntimeException(e); + throw new BadRequestException("获取锁异常"); } try { if (openLock) { @@ -975,7 +975,7 @@ public class SlitterServiceImpl implements SlitterService { try { tryLock = lock.tryLock(0, TimeUnit.SECONDS); } catch (InterruptedException e) { - throw new RuntimeException(e); + throw new BadRequestException("获取锁异常"); } try { if (tryLock) { From b029409489d72cc721e0482831234d4fffe75809 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 9 Jul 2024 15:28:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=94=BE=E8=B4=A7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BstIvtPackageinfoivtServiceImpl.java | 19 ++++++++++++++++++- .../sch/tasks/first_floor_area/DjqTask.java | 1 - 2 files changed, 18 insertions(+), 2 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 01d775aa6..c51308225 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 @@ -91,6 +91,15 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl(page.getPage() + 1, page.getSize()), queryWrapper); } + /** + * 查询没有搬运任务的空的目标点位 + * @param ivtType 点位类型 + * @param ivtStatus 库存状态 + * @param pointCode 取货还是放货 + * @param sortType 点位排序规则1：升序2：降序 + * @param taskType 任务类型 + * @return List + */ @Override public List checkEndPointTask(String ivtType, String ivtStatus, String pointCode, String sortType, String taskType) { List packageinfoivtList = getBstIvtPackageinfoivts(ivtType, ivtStatus, sortType); @@ -132,7 +141,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl Stream.of( task.getPoint_code1(), task.getPoint_code2(), @@ -412,6 +420,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl满轴缓存位"))) { + //放满轴任务不判断终点是否有任务 + taskPointType = PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务放货"); } + BstIvtPackageinfoivt bstIvtPackageinfoivt = bstIvtPackageinfoivtMapper.selectOne(queryWrapper); //根据任务类型返回点位分配规则 BstIvtPackageinfoivt ivtInfo = getIvtInfoFromRegion(baseTask.getTask_type(), actionType); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 780ba1bf9..f9a382729 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java @@ -78,7 +78,6 @@ public class DjqTask extends AbstractAcsTask { .product_area(r.getProduct_area()) .agv_action_type(r.getVehicle_code2()) .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务")) - .interaction_json(JSON.parseObject(r.getRequest_param())) .build(); resultList.add(dto); }); From 9397be254d7f7cbbf004d10b19ce5e48508386ab Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 9 Jul 2024 15:29:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=94=BE=E8=B4=A7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index 52c6a28b7..7ea61f4e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java @@ -73,7 +73,6 @@ public class GzqTask extends AbstractAcsTask { .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务")) //.truss_type(PackageInfoIvtEnum.TRUSS_TYPE.code("点对点任务")) //.dtl_type(r.getDtl_type()) - .interaction_json(JSON.parseObject(r.getRequest_param())) .build(); resultList.add(dto); }); From 0b7f0783e709c326c283d90f818b3d1270444217 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 9 Jul 2024 16:12:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StIvtIostorinvdtlServiceImpl.java | 16 +++++++++------- .../util/impl/LashManageServiceImpl.java | 8 +++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java index 2bcc294ff..0ce9ddbf6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java @@ -305,13 +305,15 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl().lambda() - .set(StIvtIostorinvdtl::getBill_status, dtlDao.getBill_status()) - .eq(StIvtIostorinvdtl::getIostorinv_id, dtlDao.getIostorinv_id()) - .eq(StIvtIostorinvdtl::getBox_no, dtlDao.getBox_no()) - ); + // 更新此木箱中所有的明细状态 (如果此明细的木箱不为空) + if (ObjectUtil.isNotEmpty(dtlDao.getBox_no())) { + this.update( + new UpdateWrapper().lambda() + .set(StIvtIostorinvdtl::getBill_status, dtlDao.getBill_status()) + .eq(StIvtIostorinvdtl::getIostorinv_id, dtlDao.getIostorinv_id()) + .eq(StIvtIostorinvdtl::getBox_no, dtlDao.getBox_no()) + ); + } } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index 9b20d7b71..61b2eb7e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -90,6 +90,12 @@ public class LashManageServiceImpl implements LashManageService { throw new BadRequestException("没有此木箱信息："+whereJson.getString("vehicle_code")); } + // 获取次木箱对应的木箱类型 + MdpbBoxtype boxTypeDao = iMdpbBoxtypeService.getById(boxDao.getMaterial_code()); + if (ObjectUtil.isEmpty(boxTypeDao)) { + throw new BadRequestException("木箱类型不存在!"+boxDao.getMaterial_code()); + } + JSONObject jsonSub = WQLObject.getWQLObject("pdm_bi_subpackagerelation") .query("package_box_sn = '" + boxDao.getBox_no() + "'") .uniqueResult(0); @@ -132,7 +138,7 @@ public class LashManageServiceImpl implements LashManageService { jsonPoint.put("vehicle_qty", NumberUtil.add(jsonPoint.getBigDecimal("vehicle_qty"),1)); - if (jsonPoint.getIntValue("vehicle_qty") == Integer.parseInt(boxDao.getLash_num())) { + if (jsonPoint.getIntValue("vehicle_qty") == Integer.parseInt(boxTypeDao.getLash_num_tow())) { // 相同清空载具以及数量 jsonPoint.put("vehicle_qty",0); jsonPoint.put("vehicle_code","");