From 1595f7e9b90b33c1ca57cab4eb836cc692b4ced8 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 14 Mar 2024 18:44:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E8=BD=AC=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 736c7f3df..31db8d14e 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 @@ -95,6 +95,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl>>>>>>>,{}",distributionStockListEntity); - distributionStockListService.save(distributionStockListEntity); +// distributionStockListService.save(distributionStockListEntity); + distributionStockListService.getBaseMapper().insert(distributionStockListEntity); } // distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘 // distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息 From 0cdf963360aa16a3d25bfefc7abd135d26684d10 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 14 Mar 2024 18:48:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E8=BD=AC=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 31db8d14e..ece08625c 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 @@ -855,7 +855,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl Date: Thu, 14 Mar 2024 19:30:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E9=9B=B6=E6=8B=85=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8B=86=E5=8D=95=EF=BC=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionStockArticleClient.java | 3 +++ .../feign/DistributionStockArticleClient.java | 5 +++++ .../mapper/DistributionStockArticleMapper.java | 2 ++ .../mapper/DistributionStockArticleMapper.xml | 8 ++++++++ .../service/IDistributionStockArticleService.java | 3 +++ .../service/impl/DistributionStockArticleServiceImpl.java | 6 +++++- .../service/impl/WarehouseWaybillServiceImpl.java | 4 +--- 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index 74929194e..3624383b6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -136,4 +136,7 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/findZeroListByWarehouseId") IPage findZeroListByWarehouseId(@RequestParam Long warehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize); + + @GetMapping(API_PREFIX + "/submitHandleNumAndTotalNumberByOrderId") + void submitHandleNumAndTotalNumberByOrderId(@RequestParam Integer subNum, @RequestParam Long articleId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 639986d33..fa491b5d9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -278,4 +278,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle return distributionStockArticleService.findZeroListByWarehouseId(warehouseId,pageNum,pageSize); } + @Override + public void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId) { + distributionStockArticleService.submitHandleNumAndTotalNumberByOrderId(subNum,articleId); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index d974cd400..41c29358c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -179,4 +179,6 @@ public interface DistributionStockArticleMapper extends BaseMapper getOrderListByWaybill(@Param("waybillNumber") String waybillNumber); List findListByOrderCodeLike(@Param("orderCode") String orderCode); + + void submitHandleNumAndTotalNumberByOrderId(@Param("subNum") Integer subNum, @Param("articleId") Long articleId); } 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 001597a3c..2e769b63c 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 @@ -1064,4 +1064,12 @@ AND waybill_number != '' + + update logpm_distribution_stock_article + set total_number = total_number - #{subNum}, + hand_quantity = hand_quantity - #{subNum}, + incoming_num = incoming_num - #{subNum} + where id = #{articleId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index e884a75e6..9a8fee6e1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -229,4 +229,7 @@ public interface IDistributionStockArticleService extends BaseService findListByOrderCodeLike(String orderCode); + + void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 7629c2902..f8392b7ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -56,7 +56,6 @@ import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusCon import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; -import org.springblade.common.constant.reservation.ReservationOrderStatusConstant; import org.springblade.common.constant.reservation.ReservationPackageStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -1784,6 +1783,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl