From d44d35f4ce880373e81c8ba37f8c00b583e093c4 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 28 Jul 2023 18:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E6=8F=90=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/serviceConstant/ServiceConstant.java | 10 +++++----- .../DistributionBillLadingAppController.java | 2 +- .../DistributionStockupAppController.java | 4 ++-- .../mapper/DistrilbutionBillLadingMapper.xml | 4 ++-- .../service/impl/DistributionAsyncServiceImpl.java | 6 ++++-- .../impl/DistributionReservationServiceImpl.java | 4 ++-- .../service/impl/DistributionStockServiceImpl.java | 4 ++-- .../impl/DistrilbutionBillLadingServiceImpl.java | 8 +++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java index 8800f0e51..c71ff830a 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java @@ -76,26 +76,26 @@ public interface ServiceConstant { /** * 订单状态 -- 未预约 */ - Integer ORDER_STATE_NOT_RESERVATION =1; + String ORDER_STATE_NOT_RESERVATION ="1"; /** * 订单状态 -- 已预约 */ - Integer ORDER_STATE_ALREADY_RESERVATION =2; + String ORDER_STATE_ALREADY_RESERVATION ="2"; /** * 订单状态 -- 待配送 */ - Integer ORDER_STATE_WAIT_DELIVERY =3; + String ORDER_STATE_WAIT_DELIVERY ="3"; /** * 订单状态 -- 配送中 */ - Integer ORDER_STATE_EXECUTION_DELIVERY =4; + String ORDER_STATE_EXECUTION_DELIVERY ="4"; /** * 订单状态 -- 完成配送 */ - Integer ORDER_STATE_COMPLETE_DELIVERY =5; + String ORDER_STATE_COMPLETE_DELIVERY ="5"; /** * 订单数据 -- 无数据源 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java index fa3856690..92874bdb5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java @@ -98,7 +98,7 @@ public class DistributionBillLadingAppController extends BladeController { } @ApiOperation(value = "自提订单列表库存品详细包件",notes = "自提订单列表库存品详细包件") - @GetMapping("/getInventory") + @GetMapping("/getInventoryNum") @ApiOperationSupport(order = 1) public R> getInventoryNum(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query){ IPage ladingAppVOIPage = distrilbutionBillLadingService.getInventoryNum(Condition.getPage(query),distrilbutionBillLading); 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 24d3cc1c8..72078d567 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 @@ -244,7 +244,7 @@ public class DistributionStockupAppController extends BladeController { entity.setCoding(packetBarCode); entity.setStockupArea(stockupArea); entity.setReservationId(reservationId); - entity.setConditions(0); + entity.setConditions("0"); entity.setType(2); distributionStockService.save(entity); @@ -289,7 +289,7 @@ public class DistributionStockupAppController extends BladeController { entity.setStockupArea(stockupArea); entity.setReservationId(reservationId); entity.setStockListId(stockListId); - entity.setConditions(0); + entity.setConditions("0"); entity.setType(2); distributionStockService.save(entity); 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 127fb22fc..3acc8f0d1 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 @@ -139,8 +139,8 @@ select ldsa.id,ldsa.order_self_numbering orderSelfNumbering,ldsa.description_goods descriptionGoods,ldsa.total_number totalNumber, ldbl.stockup_status stockupStatus,ldbl.stockip_allocation stockipAllocation, ( select count(*) - from logpm_distribution_stockup_scan ldss - where ldss.parcel_list_id in ( + from logpm_distribution_stock lds + where lds.parcel_list_id in ( select ldpi.id from logpm_distribution_parcel_list ldpi where ldpi.stock_article_id in ( diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 22fc1379b..104e2bd43 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -7,6 +7,7 @@ import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.mapper.DistributionLoadscanMapper; import com.logpm.distribution.mapper.DistributionParcelListMapper; +import com.logpm.distribution.mapper.DistributionStockMapper; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.DistributionStockupVO; import com.logpm.distribution.vo.DistrilbutionBillStockVO; @@ -30,7 +31,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { private final DistributionLoadscanMapper distributionLoadscanMapper; private final IDistributionStockArticleService distributionStockArticleService; - private final IDistributionStockService distributionStockService; + private final DistributionStockMapper distributionStockService; private final IDistrilbutionBillStockService distrilbutionBillStockService; private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService; @@ -101,7 +102,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { DistributionStockEntity distributionStock = new DistributionStockEntity(); distributionStock.setId(id); distributionStock.setConditions("3"); - return distributionStockService.updateById(distributionStock); + int i = distributionStockService.updateById(distributionStock); + return i > 0 ? true : false; } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 7d49c7d45..2befb7dfc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -536,9 +536,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl r.getReservationNum()) { //这里表示订单下的包件没有进行全部配送 //修改订单状态为部分配送 - stockArticleEntity.setState(4); + stockArticleEntity.setState("4"); //修改订单的在库数量 - stockArticleEntity.setState(stockArticleEntity.getHandQuantity() - r.getReservationNum()); + stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - r.getReservationNum()); //对订单进行修改 distributionStockArticleService.updateById(stockArticleEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java index b9e1e74ae..d0e6f306e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java @@ -98,7 +98,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl 0){ addPrint(distrilbutionBillLading); @@ -217,6 +214,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl