From b1c02509e5efd48bcdf97dc587af9e21271be895 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 20 Nov 2024 18:33:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=AE=E6=94=B9BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=81=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=AD=E8=BD=AC=E8=BF=87=E6=BB=A4=E3=80=81?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E6=8B=A6=E6=88=AA=E4=B8=AD?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basic/controller/BasicMaterialController.java | 6 ++++-- .../distribution/mapper/DistributionParcelListMapper.xml | 2 +- .../service/impl/DistributionSignforServiceImpl.java | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java index f018abec8..ea7fa2660 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -51,6 +51,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -202,8 +203,9 @@ public class BasicMaterialController extends BladeController { log.info("物料添加失败！"); return R.fail("添加失败，必填物料信息不完整为空！"); } - - checkBasicMaterialEntity(basicMaterial); + if (Objects.isNull(basicMaterial.getId())){ + checkBasicMaterialEntity(basicMaterial); + } return R.status(basicMaterialService.saveOrUpdateOwn(basicMaterial)); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 1c8026612..a3666d336 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -236,7 +236,7 @@ ) AS c ON c.parcel_list_id = ldpl.id - ldpl.is_deleted = 0 + ldpl.is_deleted = 0 AND ldpl.is_transfer = 0 and lww.name like concat('%',#{param.warehouse},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 9c4fe7ed9..b88a1f4c5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3626,6 +3626,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) + .eq(DistributionParcelListEntity::getIsTransfer, 0) ); DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(distributionDeliveryListEntity, user, null, driver); From b87c34280a1f9eb9ec24e4f4b0eba10050f5c3e4 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 20 Nov 2024 18:35:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=B8=AD=E8=BD=AC=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionParcelListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index a3666d336..036beca02 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -1205,7 +1205,7 @@