From ca66e7e7761e98c4d28e393d4cbacd87f91dcc7f Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 26 Jan 2026 17:47:54 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...merbaseMapper.xml => PdaNotCarService.xml} | 0 .../service/impl/NotCarToWmsServiceImpl.java | 7 ++-- ...ntroller.java => PdaNotCarController.java} | 6 +-- ...tCarService.java => PdaNotCarService.java} | 2 +- .../service/impl/PdaCommonServiceImpl.java | 6 ++- ...iceImpl.java => PdaNotCarServiceImpl.java} | 9 ++--- .../service/impl/PdaPackagingServiceImpl.java | 5 ++- .../dao/mapper/MdPdmPackagingMapper.xml | 5 +++ ...nedBoxService.xml => PdaNotCarService.xml} | 0 .../util/tasks/EmpStackPlatesTask.java | 19 ++++++++-- .../util/tasks/PackagingMiddleTask.java | 37 ++++++++++++++++--- .../src/views/wms/basedata/bucked/index.vue | 2 +- .../src/views/wms/basedata/groupbag/index.vue | 2 +- 13 files changed, 71 insertions(+), 29 deletions(-) rename wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/{MdCsCustomerbaseMapper.xml => PdaNotCarService.xml} (100%) rename wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/{NotCarController.java => PdaNotCarController.java} (94%) rename wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/{NotCarService.java => PdaNotCarService.java} (97%) rename wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/{NotCarServiceImpl.java => PdaNotCarServiceImpl.java} (94%) rename wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/{IStIvtCombinedBoxService.xml => PdaNotCarService.xml} (100%) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsCustomerbaseMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/PdaNotCarService.xml similarity index 100% rename from wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsCustomerbaseMapper.xml rename to wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/PdaNotCarService.xml diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/NotCarToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/NotCarToWmsServiceImpl.java index ab6e0d5..ac8b37e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/NotCarToWmsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/NotCarToWmsServiceImpl.java @@ -119,8 +119,9 @@ public class NotCarToWmsServiceImpl implements NotCarToWmsService { boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); try { if (tryLock) { - - + JSONObject data = whereJson.getJSONObject("data"); + String statusType = data.getString("statusType"); + // 前往点位 } else { log.info("无人车到达输出参数：{}", NoCarResponse.requestError("当前任务正在执行中，请稍后在试...").toString()); return NoCarResponse.requestError("当前任务正在执行中，请稍后在试..."); @@ -130,7 +131,7 @@ public class NotCarToWmsServiceImpl implements NotCarToWmsService { lock.unlock(); } } - log.info("无人车到达输出参数：{}", NoCarResponse.responseOk().toString()); + // log.info("无人车到达输出参数：{}", NoCarResponse.responseOk().toString()); return NoCarResponse.responseOk(); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/NotCarController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java similarity index 94% rename from wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/NotCarController.java rename to wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java index 9f83071..d815bd4 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/NotCarController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pda.general_management.service.NotCarService; +import org.nl.wms.pda.general_management.service.PdaNotCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor @RequestMapping("/api/notCar") @Slf4j -public class NotCarController { +public class PdaNotCarController { @Autowired - private NotCarService notCarService; + private PdaNotCarService notCarService; @PostMapping("/queryXhRegion") @Log("无人车卸货 - 查询卸货区下拉框") diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/NotCarService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java similarity index 97% rename from wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/NotCarService.java rename to wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java index 37b2a85..db819c9 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/NotCarService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java @@ -11,7 +11,7 @@ import org.nl.wms.pda.util.PdaResponse; * @author Liuxy * @since 2026-01-06 */ -public interface NotCarService { +public interface PdaNotCarService { /** * 无人车卸货 - 查询卸货区下拉框 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java index c8cb74a..eaf709f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java @@ -252,6 +252,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { List pointCodeList = pointDaoList.stream() .map(SchBasePoint::getPoint_code) .collect(Collectors.toList()); + pointCodeList.add(IOSConstant.AGVZJZ001); // 查询当前正在执行的任务 List taskList = taskService.list( @@ -270,7 +271,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { json.put("vehicle_qty", pointDao.getVehicle_qty()); // 查询待堆叠数量 List collectQtyList = taskList.stream() - .filter(row -> row.getPoint_code2().equals(pointDao.getPoint_code())) + .filter(row -> row.getPoint_code3().equals(pointDao.getPoint_code())) .collect(Collectors.toList()); json.put("execution_task", ObjectUtil.isNotEmpty(collectQtyList) ? collectQtyList.size() : 0); // 计算剩余可堆叠数量 @@ -303,7 +304,8 @@ public class PdaCommonServiceImpl implements PdaCommonService { // 生成任务 JSONObject jsonTask = new JSONObject(); jsonTask.put("point_code1", whereJson.getString("point_code")); - jsonTask.put("point_code2", row.getString("point_code")); + jsonTask.put("point_code2", IOSConstant.AGVZJZ001); + jsonTask.put("point_code3", row.getString("point_code")); empStackPlatesTask.create(jsonTask); return PdaResponse.requestOk(); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/NotCarServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java similarity index 94% rename from wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/NotCarServiceImpl.java rename to wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java index 0738965..90a7da3 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/NotCarServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java @@ -1,13 +1,10 @@ package org.nl.wms.pda.general_management.service.impl; -import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.JSONObjectOf; import org.nl.wms.ext.service.WmsToNotCarService; -import org.nl.wms.ext.util.BaseResponse; -import org.nl.wms.pda.general_management.service.NotCarService; +import org.nl.wms.pda.general_management.service.PdaNotCarService; import org.nl.wms.pda.util.PdaResponse; import org.nl.wms.sch_manage.service.ISchBaseRegionService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; @@ -31,7 +28,7 @@ import java.util.List; * @since 2026-01-06 */ @Service -public class NotCarServiceImpl implements NotCarService { +public class PdaNotCarServiceImpl implements PdaNotCarService { /** * 区域服务 @@ -127,7 +124,7 @@ public class NotCarServiceImpl implements NotCarService { .eq(SchBasePoint::getRegion_code, region_code) .eq(SchBasePoint::getIs_used, IOSConstant.ONE) .and(row -> row.isNull(SchBasePoint::getIng_task_code) - .or().eq(SchBasePoint::getIng_task_code,"") + .or().eq(SchBasePoint::getIng_task_code, "") ) .orderByAsc(SchBasePoint::getPoint_code) ); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java index 8d9a246..4a83956 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java @@ -192,8 +192,9 @@ public class PdaPackagingServiceImpl implements PdaPackagingService { jsonTask.put("point_code1", whereJson.getString("point_code")); // 判断点位是否需要二次配送 SchBasePoint endPoint = iSchBasePointService.getById(whereJson.getString("in_point_code")); - jsonTask.put("point_code2", endPoint.getIs_auto() ? whereJson.getString("in_point_code") : IOSConstant.AGVZJZ001); - jsonTask.put("point_code3", whereJson.getString("in_point_code")); + jsonTask.put("point_code2", IOSConstant.AGVZJZ001); + jsonTask.put("point_code3", endPoint.getIs_auto() ? whereJson.getString("in_point_code") : ""); + jsonTask.put("point_code4", whereJson.getString("in_point_code")); jsonTask.put("material_id", rows.get(0).getString("material_id")); jsonTask.put("material_qty", whereJson.getString("total_qty")); packagingMiddleTask.create(jsonTask); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_management/service/dao/mapper/MdPdmPackagingMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_management/service/dao/mapper/MdPdmPackagingMapper.xml index b1b30dd..b74d411 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_management/service/dao/mapper/MdPdmPackagingMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_management/service/dao/mapper/MdPdmPackagingMapper.xml @@ -51,6 +51,11 @@ AND pack.point_code = #{param.out_point} + + + AND + mater.material_code = #{param.material_code} + ORDER BY pack.create_time Desc diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/IStIvtCombinedBoxService.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/PdaNotCarService.xml similarity index 100% rename from wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/IStIvtCombinedBoxService.xml rename to wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/PdaNotCarService.xml diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java index dd6559b..f8076e0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java @@ -56,6 +56,7 @@ public class EmpStackPlatesTask extends AbstractTask { task.setConfig_code(EmpStackPlatesTask.class.getSimpleName()); task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); + task.setPoint_code3(json.getString("point_code3")); task.setVehicle_code(json.getString("vehicle_code")); task.setMaterial_id(json.getString("material_id")); task.setMaterial_qty(json.getBigDecimal("material_qty")); @@ -144,10 +145,20 @@ public class EmpStackPlatesTask extends AbstractTask { taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); - // 更新当前点位载具数量 - SchBasePoint pointDao = iSchBasePointService.getById(taskObj.getPoint_code2()); - pointDao.setVehicle_qty(NumberUtil.add(pointDao.getVehicle_qty(), Integer.valueOf(1)).intValue()); - iSchBasePointService.updateById(pointDao); + // 判断是否是中间站点 + if (taskObj.getPoint_code2().equals(IOSConstant.AGVZJZ001)) { + // 生成二段任务 + JSONObject jsonTask = new JSONObject(); + jsonTask.put("point_code1", IOSConstant.AGVZJZ001); + jsonTask.put("point_code2", taskObj.getPoint_code3()); + jsonTask.put("point_code3", taskObj.getPoint_code3()); + this.create(jsonTask); + } else { + // 更新当前点位载具数量 + SchBasePoint pointDao = iSchBasePointService.getById(taskObj.getPoint_code3()); + pointDao.setVehicle_qty(NumberUtil.add(pointDao.getVehicle_qty(), Integer.valueOf(1)).intValue()); + iSchBasePointService.updateById(pointDao); + } } @Transactional(rollbackFor = Exception.class) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PackagingMiddleTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PackagingMiddleTask.java index 2467634..8bd2108 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PackagingMiddleTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PackagingMiddleTask.java @@ -57,6 +57,7 @@ public class PackagingMiddleTask extends AbstractTask { task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); task.setPoint_code3(json.getString("point_code3")); + task.setPoint_code4(json.getString("point_code4")); task.setVehicle_code(json.getString("vehicle_code")); task.setMaterial_id(json.getString("material_id")); task.setMaterial_qty(json.getBigDecimal("material_qty")); @@ -145,12 +146,36 @@ public class PackagingMiddleTask extends AbstractTask { taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); - // 跟更新库存点位 - iMdPdmPackagingService.update( - new UpdateWrapper().lambda() - .eq(MdPdmPackaging::getPoint_code, taskObj.getPoint_code1()) - .set(MdPdmPackaging::getPoint_code, taskObj.getPoint_code3()) - ); + if (taskObj.getPoint_code2().equals(IOSConstant.AGVZJZ001)) { + // 判断point_code3是否有值 + if (ObjectUtil.isEmpty(taskObj.getPoint_code3())) { + // 更新库存 + iMdPdmPackagingService.update( + new UpdateWrapper().lambda() + .eq(MdPdmPackaging::getPoint_code, taskObj.getPoint_code1()) + .set(MdPdmPackaging::getPoint_code, taskObj.getPoint_code4()) + ); + } else { + // 生成任务 + JSONObject jsonTask = new JSONObject(); + jsonTask.put("point_code1", IOSConstant.AGVZJZ001); + jsonTask.put("point_code2", taskObj.getPoint_code3()); + // 储存第一条任务的起点 + jsonTask.put("point_code3", taskObj.getPoint_code1()); + // 储存最终终点 + jsonTask.put("point_code4", taskObj.getPoint_code3()); + jsonTask.put("material_id", taskObj.getMaterial_id()); + jsonTask.put("material_qty", taskObj.getMaterial_qty()); + this.create(jsonTask); + } + } else { + // 更新库存 + iMdPdmPackagingService.update( + new UpdateWrapper().lambda() + .eq(MdPdmPackaging::getPoint_code, taskObj.getPoint_code3()) + .set(MdPdmPackaging::getPoint_code, taskObj.getPoint_code4()) + ); + } } @Transactional(rollbackFor = Exception.class) diff --git a/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue b/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue index e875802..30e51dc 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue @@ -290,7 +290,7 @@ export default { LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码') LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10) - LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '') + LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '-' + row.material_code) LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ' + row.bucket_code + '') LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ' + row.bucket_weight + '') LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ') diff --git a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue index 52cbdad..f5d9c43 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue @@ -362,7 +362,7 @@ export default { LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8) LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '') LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码') - LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '') + LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '-' + row.material_code) LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '27.09mm', '5.69mm', '有 效 期 至 口') LODOP.ADD_PRINT_TEXT('46.78mm', '47.33mm', '27.62mm', '5.69mm', '复 验 期 至 口') LODOP.ADD_PRINT_TEXT('51.01mm', '47.33mm', '21.54mm', '5.69mm', 'Expory Date')