From f7cf486aeb489043814e508b5445cbfc679e839b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 21 Oct 2024 10:51:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistrilbutionBillLadingEntity.java | 7 +++++++ .../mapper/DistrilbutionBillLadingMapper.xml | 1 + .../DistrilbutionBillLadingServiceImpl.java | 17 +++++++++-------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java index 8e048dade..9b249b2d7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java @@ -180,6 +180,13 @@ public class DistrilbutionBillLadingEntity extends TenantEntity { private String examineUserName; + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 77e08cdfb..de91a1cb5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -24,6 +24,7 @@ + UPDATE logpm_distrilbution_bill_package SET packet_bar_status = 3 WHERE bill_lading_id IN diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index b0ff89c80..b2fd2be42 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -948,7 +948,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl" + newEntity.getConsigneeUnit()) + + ";收货单位:" + ((Objects.isNull(oldEntity.getConsigneeUnit()) ? "未填写" : oldEntity.getConsigneeUnit()).equals((Objects.isNull(newEntity.getConsigneeUnit()) ? "未填写" : newEntity.getConsigneeUnit())) ? oldEntity.getConsigneeUnit() : "由" + oldEntity.getConsigneeUnit() + "变更为-->" + newEntity.getConsigneeUnit()) + ",提货人:" + (oldEntity.getConsignee().equals(newEntity.getConsignee()) ? oldEntity.getConsignee() : "由" + oldEntity.getConsignee() + "变更为-->" + newEntity.getConsignee()) + ",提货车牌:" + (oldEntity.getPickUpPlate().equals(newEntity.getPickUpPlate()) ? oldEntity.getPickUpPlate() : "由" + oldEntity.getPickUpPlate() + "变更为-->" + newEntity.getPickUpPlate()) + ",提货证件:" + (oldEntity.getDeliveryDocument().equals(newEntity.getDeliveryDocument()) ? oldEntity.getDeliveryDocument() : "由" + oldEntity.getDeliveryDocument() + "变更为-->" + newEntity.getDeliveryDocument()) @@ -4033,7 +4033,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl recoveryInventoryPackageList = list.stream().filter(f -> InventorySigningStatusConstant.weiqianshou.getValue().equals(f.getStockSignfoStatus())).collect(Collectors.toList()); if (!recoveryInventoryPackageList.isEmpty()) { Map> recoveryInventoryPackageGroupByMap = recoveryInventoryPackageList.stream().collect(Collectors.groupingBy(DisStockListDetailEntity::getStockListId)); - recoveryInventoryPackageGroupByMap.forEach((k,v)->{ + recoveryInventoryPackageGroupByMap.forEach((k, v) -> { //进行指定库存品的冻结数量进行释放 DistributionStockListEntity stockListEntity = distributionStockListService.getById(k); - if (Objects.isNull(stockListEntity)){ - log.error("查询库存品信息错误>>>>>>>>>>>>>>>>>updateStock,id:{}",k); + if (Objects.isNull(stockListEntity)) { + log.error("查询库存品信息错误>>>>>>>>>>>>>>>>>updateStock,id:{}", k); throw new CustomerException("查询库存品信息错误"); } //维护库存品的冻结数量 - distributionStockListMapper.decreaseStockListQuantityOccupied(k,v.stream().mapToInt(DisStockListDetailEntity::getNum).sum()); + distributionStockListMapper.decreaseStockListQuantityOccupied(k, v.stream().mapToInt(DisStockListDetailEntity::getNum).sum()); cancelList.addAll(v); }); } if (!cancelList.isEmpty()) { - cancelList.stream().forEach(c->c.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue())); + cancelList.stream().forEach(c -> c.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue())); List packageList = cancelList.stream().filter(p -> InventoryStockTypeStatusConstant.caiji.getValue().equals(p.getStockType()) && InventoryStockUpStatusConstant.yibeihuo.getValue().equals(p.getStockStatus())).collect(Collectors.toList()); if (!packageList.isEmpty()) { //TODO这是包件转的库存品进行包件的 @@ -4493,6 +4493,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl Date: Mon, 21 Oct 2024 14:45:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=9C=A8=E9=80=94?= =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 4aac1d39e..9a6606a82 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -2229,10 +2229,10 @@ - and lww.create_time > = #{param.openTimeStart} + and lww.create_time >= #{param.openTimeStart} - and lww.create_time < = #{param.openTimeEnd} + and lww.create_time <= #{param.openTimeEnd} group by ldpl.order_code,ldpl.waybill_number