From ed1d084275b8f8c6247253abdb1e63344aa8ec91 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 18 Oct 2023 13:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/pda/PdaAudioLingoStatus.java | 51 +++++++++++ .../DistributionStockupAppController.java | 90 ++++++++++--------- .../impl/DistributionStockupServiceImpl.java | 9 +- .../DistrilbutionBillLadingServiceImpl.java | 28 +++++- 4 files changed, 129 insertions(+), 49 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/pda/PdaAudioLingoStatus.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/pda/PdaAudioLingoStatus.java b/blade-biz-common/src/main/java/org/springblade/common/constant/pda/PdaAudioLingoStatus.java new file mode 100644 index 000000000..502700849 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/pda/PdaAudioLingoStatus.java @@ -0,0 +1,51 @@ +package org.springblade.common.constant.pda; + +public enum PdaAudioLingoStatus { + + saomiaochenggong("扫码成功","1"), + chongfusaomiao("重复扫描","2"), + baojianbucunzai("包件信息不存在","3"), + caozuoshibai("操作失败","4"), + cuanhuo("窜货","5"), + yiwancheng("已完成","6"), + baotiaomabucunzai("包条码不存在","7"), + baotiaomayishiyong("条码已使用","8"), + meiyou("没有待绑定的库存品信息","9"), + buzai("扫描到不是本次拣货计划的包件","10"), + yuyuebuzai("预约信息不存在","11"), + weizhicuowu("未知错误","100"); + + + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private String value; + + + private PdaAudioLingoStatus(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} 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 84bfb06a8..74cf38d09 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 @@ -43,6 +43,7 @@ import lombok.extern.log4j.Log4j2; import org.redisson.api.RLock; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.RabbitConstant; +import org.springblade.common.constant.pda.PdaAudioLingoStatus; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.constant.stockup.StockupTypeStatusConstant; import org.springblade.common.utils.CommonUtil; @@ -534,8 +535,8 @@ public class DistributionStockupAppController extends BladeController { String lockKey = stockupDTO.getPacketBarCode()+stockupDTO.getStockupId(); RLock lock = new RedissonConfig().redisson().getLock(lockKey); if(lock.isLocked()){ - String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2"); - return Resp.scanFail("重复扫描！", audioValue2); + String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(), audioValue2); } lock.lock(5, TimeUnit.SECONDS); if (scanType == 1) { @@ -629,31 +630,31 @@ public class DistributionStockupAppController extends BladeController { //将消息携带绑定键值 rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_STATE_UPDATE_EXCHANGE, RabbitConstant.STOCKUP_STATE_UPDATE_ROUTING, mapState); - String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "1"); + String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue()); //查询是否货位数据是否该下架 // distributionAsyncService.stockupSelfOffShelf(stockupDTO); - return Resp.scanSuccess("扫描成功！", audioValue); + return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue); case 2: //重复扫描 - String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2"); - return Resp.scanFail("重复扫描！", audioValue2); + String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(), audioValue2); case 3: //包件不存在 - String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "3"); - return Resp.scanFail("包件不存在！", audioValue3); + String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomabucunzai.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.baotiaomabucunzai.getName(), audioValue3); case 4: //操作失败 - String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "4"); - return Resp.scanFail("操作失败！", audioValue4); + String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.caozuoshibai.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.caozuoshibai.getName(), audioValue4); case 5: //窜货 - String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "5"); - return Resp.scanFail("窜货！", audioValue5); + String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.buzai.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.buzai.getName(), audioValue5); default: log.warn("###备货扫描：未知错误"); - return Resp.scanFail("未知错误！", "未知错误"); + return Resp.scanFail(PdaAudioLingoStatus.weizhicuowu.getName(), PdaAudioLingoStatus.weizhicuowu.getName()); } } else if (scanType == 2) { @@ -752,7 +753,7 @@ public class DistributionStockupAppController extends BladeController { R r = warehouseUpdownTypeClient.downStock(list); log.debug("下架状态：{}",r.getMsg()); }else{ - return R.fail(3002,"本货位的物料已为0，请更换货位继续！！"); + return Resp.scanFail("本货位的物料已为0，请更换货位继续！！","本货位的物料已为0，请更换货位继续！！"); } }else{ return Resp.scanFail("物料信息查询失败，请联系管理员！！", "物料信息查询失败，请联系管理员！！"); @@ -770,49 +771,50 @@ public class DistributionStockupAppController extends BladeController { map.put("createTime", new Date().getTime()); //将消息携带绑定键值 rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_SCAN_EXCHANGE, RabbitConstant.STOCKUP_SCAN_ROUTING, map); - String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "1"); - return Resp.scanSuccess("扫描成功！",audioValue); + String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue()); + //扫码成功 + return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(),audioValue); case 2: - //扫码失败 - String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2"); - return Resp.scanFail("重复扫描！",audioValue2); + //重复扫描 + String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(),audioValue2); case 3: - //重复扫码 - String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "3"); - return Resp.scanFail("包件不存在！",audioValue3); + //包件不存在 + String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO,PdaAudioLingoStatus.baojianbucunzai.getValue() ); + return Resp.scanFail(PdaAudioLingoStatus.baojianbucunzai.getName(),audioValue3); case 4: - //重复扫码 - String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "4"); - return Resp.scanFail("操作失败！", audioValue4); + //操作失败 + String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.caozuoshibai.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.caozuoshibai.getName(), audioValue4); case 5: - //重复扫码 - String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "5"); - return Resp.scanFail("窜货！", audioValue5); + //窜货 + String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.cuanhuo.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.cuanhuo.getName(), audioValue5); case 6: - //重复扫码 - String audioValue6 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "6"); - return Resp.scanFail("已完成！", audioValue6); + //已完成 + String audioValue6 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.yiwancheng.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.yiwancheng.getName(), audioValue6); case 7: - //重复扫码 - String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "7"); - return Resp.scanFail("包条码不存在！", audioValue7); + //包条码不存在 + String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomabucunzai.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.baotiaomabucunzai.getName(), audioValue7); default: log.warn("###备货扫描：未知错误"); - return Resp.scanFail("未知错误！", "未知错误"); + return Resp.scanFail(PdaAudioLingoStatus.weizhicuowu.getName(), PdaAudioLingoStatus.weizhicuowu.getName()); } case 7: - //重复扫码 - String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "7"); - return Resp.scanFail("包条码不存在！", audioValue7); + //包条码不存在 + String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomabucunzai.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.baotiaomabucunzai.getName(), audioValue7); case 8: - //重复扫码 - String audioValue8 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "8"); - return Resp.scanFail("条码已使用！", audioValue8); + //条码已使用 + String audioValue8 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomayishiyong.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.baotiaomayishiyong.getName(), audioValue8); case 9: - //重复扫码 - String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "9"); - return Resp.scanFail("没有待绑定的库存品信息！", audioValue9); + //"没有待绑定的库存品信息！" + String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.meiyou.getValue()); + return Resp.scanFail(PdaAudioLingoStatus.meiyou.getName(), audioValue9); } 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 22045183a..59282f204 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 @@ -49,6 +49,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.CodeDesEnum; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; +import org.springblade.common.constant.pda.PdaAudioLingoStatus; import org.springblade.common.constant.stocklist.StockLockingStatusConstant; import org.springblade.common.constant.stocklist.StockSignfoStatusConstant; import org.springblade.common.constant.stocklist.StockStatusConstant; @@ -1545,11 +1546,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list4 = distributionParcelListService.list(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getOrderPackageCode, coding) + .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) + ); + if(list4.isEmpty()){ + return Resp.scanFail(PdaAudioLingoStatus.baojianbucunzai.getName(), PdaAudioLingoStatus.baojianbucunzai.getName()); + } + + DistrilbutionBillStockEntity one2 = distrilbutionBillStockService.getOne(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId) + .eq(DistrilbutionBillStockEntity::getStockArticleId, list4.get(0).getStockArticleId()) + ); + if(ObjectUtils.isNull(one2)){ + return Resp.scanFail("不在本次自提计划！","不在本次自提计划！"); + } + if(one2.getConditions().equals("2")){ + return Resp.scanFail("当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！","当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！"); } //查询是否签收 List list3 = distributionBillLadingScanService.list(Wrappers.query().lambda() @@ -1084,7 +1108,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl