From 6a05344184b7da89f03f8c0715ea79201ea0d1e2 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 18 Oct 2023 19:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 5 +- .../impl/DistributionStockupServiceImpl.java | 28 +++++++---- .../warehouse/mapper/QuestDetailMapper.xml | 6 +-- .../service/impl/TaskQuestServiceImpl.java | 49 ++++++++++++++++++- 4 files changed, 72 insertions(+), 16 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 74cf38d09..6208e705d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -502,7 +502,7 @@ public class DistributionStockupAppController extends BladeController { return R.fail(3002, "类型不匹配！！"); } - ; + @PostMapping("/getStockupArea") @ApiOperation(value = "查询可修改备货区") @@ -815,6 +815,9 @@ public class DistributionStockupAppController extends BladeController { //"没有待绑定的库存品信息！" String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.meiyou.getValue()); return Resp.scanFail(PdaAudioLingoStatus.meiyou.getName(), audioValue9); + case 10: + //"没有待绑定的库存品信息！" + return Resp.scanFail("该包件与备货物料不匹配！", "该包件与备货物料不匹配！"); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 59282f204..4ce7a7aee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1932,7 +1932,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list1 = disStockListDetailService.list(Wrappers.query().lambda() @@ -1941,22 +1941,36 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode()) .eq(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue()) + .eq(DistributionParcelListEntity::getWarehouseId, byId.getWarehouseId()) ); if(list.isEmpty()){ return 7; } + //查询包件信息与库存品选择物料是否一样 + if(!byId.getMaterialId().equals(list.get(0).getMaterialId())){ + //不一样 + return 10; + } + //绑定码 disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode()); disStockListDetail.setId(list1.get(0).getId()); break; - case 2: //查询有没有生成的数据 + case 2: + //生成的扫描的包条码 + + //查询有没有生成的数据 DisStockOrdercodeRecoEntity one1 = disStockOrdercodeRecoService.getOne(Wrappers.query().lambda() .eq(DisStockOrdercodeRecoEntity::getCode, stockupDTO.getPacketBarCode()) .eq(DisStockOrdercodeRecoEntity::getCodeStatus, "0") @@ -1976,15 +1990,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl and ldpl.dealer_name in diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index d53ebf13e..160ea6114 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -16,6 +16,7 @@ */ package com.logpm.warehouse.service.impl; +import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -308,6 +309,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailList = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId()); return R.data(getTaskTrayInfo(questDetailList)); case 2: - return Resp.scanFail("托盘信息未找到！","托盘信息未找到！"); + //返回托盘信息 + return getTrayInfo(trayByTrayCode.getId(),myCurrentWarehouse.getId(),trayByTrayCode.getPalletCode()); case 3: return Resp.scanFail("无包件信息！","无包件信息！"); default: @@ -359,6 +366,40 @@ public class TaskQuestServiceImpl extends BaseServiceImpl trayVO = new ArrayList<>(); + WarehouseTrayTypeEntity one = trayTypeService.getOne(Wrappers.query().lambda() + .eq(WarehouseTrayTypeEntity::getTrayId, trayId) + .eq(WarehouseTrayTypeEntity::getIsDeleted, 0) + ); + TaskTrayVO taskTrayVO = new TaskTrayVO(); + if(ObjectUtils.isNotNull(one)){ + //判断是否在同一个仓库 + if(one.getWarehouseId().equals(warehouseId)){ + //是 + taskTrayVO.setTrayId(trayId); + taskTrayVO.setTrayCode(taryCode); + taskTrayVO.setTotal(0); + taskTrayVO.setUnTotal(0); + taskTrayVO.setGoodsType(one.getType()); // 没有类型 + }else{ + //不是 + return Resp.scanFail("此托盘不在当前仓库！","此托盘不在当前仓库！"); + } + }else{ + //没有绑定可以使用 + taskTrayVO.setTrayId(trayId); + taskTrayVO.setTrayCode(taryCode); + taskTrayVO.setTotal(0); + taskTrayVO.setUnTotal(0); + taskTrayVO.setGoodsType("定制品"); // 定制品 + } + trayVO.add(taskTrayVO); + return R.data(trayVO); + } + /** * 出来托盘信息 @@ -631,6 +672,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl