From 6a90f9efab0c4e15050ed60f60fb548e956b99a8 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 14 Jun 2024 18:06:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E5=91=98=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 5591bd735..a341b20bd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -7243,7 +7243,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Fri, 14 Jun 2024 18:40:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionParcelListEntity.java | 12 ++++++------ .../DistributionStockupAppController.java | 2 +- .../impl/DistributionParcelListServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index e44b04a01..e94deb6ee 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -223,12 +223,12 @@ public class DistributionParcelListEntity extends TenantEntity { @ApiModelProperty(value = "零担标识") @TableField(exist = false) private String isZero; - /** - * 商场名称 - */ - @ApiModelProperty(value = "商场iD") - @TableField(exist = false) - private Long mallId; +// /** +// * 商场名称 +// */ +// @ApiModelProperty(value = "商场iD") +// @TableField(exist = false) +// private Long mallId; /** * 托盘ID */ 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 8441cdeb1..6e68be66d 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 @@ -1493,7 +1493,7 @@ public class DistributionStockupAppController extends BladeController { .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) .eq(DistributionParcelListEntity::getConditions, "2") .eq(DistributionParcelListEntity::getMaterialId, entity.getMaterialId()) - .eq(DistributionParcelListEntity::getMallId, entity.getMarketId()) + .eq(DistributionParcelListEntity::getMarketId, entity.getMarketId()) .set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue()) ); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index ee706e97a..b09821dea 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -878,7 +878,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl materialId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialId).distinct().collect(Collectors.toList()); List materialCode = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialCode).distinct().collect(Collectors.toList()); List materialUnit = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialUnit).distinct().collect(Collectors.toList()); - List mallId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMallId).distinct().collect(Collectors.toList()); + List mallId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMarketId).distinct().collect(Collectors.toList()); List materialName = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialName).distinct().collect(Collectors.toList()); List brandId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getBrandId).distinct().collect(Collectors.toList()); if (materialId.size() != 1 || materialCode.size() != 1 || materialUnit.size() != 1 || mallId.size() != 1 || materialName.size() != 1 || brandId.size() != 1) { From a6b65dbc6ea4553a6f690f8cfc6c26ca81c30558 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 15 Jun 2024 11:52:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=BB=9E=E7=95=99=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=A1=A8=E8=A3=85=E8=BD=A6=E6=95=B0=E9=87=8F?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionSignforMapper.java | 2 +- .../service/impl/DistributionDeliveryListServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index fbabb69a4..d18fdb591 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -209,7 +209,7 @@ public interface DistributionSignforMapper extends BaseMapper Date: Sat, 15 Jun 2024 20:17:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 0c6d1b936..236946395 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -481,7 +481,7 @@ FROM logpm_distribution_reservation_package ldrp WHERE - ldrp.reservation_id = lds.reservation_id and ldrp.packet_bar_status != 2 + ldrp.reservation_id = lds.reservation_id and ldrp.packet_bar_status != 2 AND ldrp.stock_article_id = ldrs.stock_article_id ) readyStock, ( SELECT From f986411789257e02778070e6117d9556cfb3182b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 17 Jun 2024 11:54:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=96=B0=E5=A2=9EBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicdataClientController.java | 2 +- .../basicdata/service/IBasicdataClientService.java | 6 ++++++ .../service/impl/BasicdataClientServiceImpl.java | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java index 8a2af0ace..0d81120f2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java @@ -182,7 +182,7 @@ public class BasicdataClientController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入basicdataClient") public R save(@Valid @RequestBody BasicdataClientEntity basicdataClient) { - return R.status(basicdataClientService.save(basicdataClient)); + return R.status(basicdataClientService.saveClient(basicdataClient)); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java index 52a528d70..448767517 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java @@ -117,4 +117,10 @@ public interface IBasicdataClientService extends BaseService