From 103d0bdf1e7bcd587e2512ae58696ec131fd2449 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 22 Jun 2024 09:51:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=B9=E6=8B=86=E5=8C=85=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manage/controller/admin/pack/PackController.java | 6 +++--- .../module/manage/dal/mysql/pack/OrderPackageMapper.java | 2 +- .../cf/imes/module/manage/service/pack/PackServiceImpl.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java index c112aedf7..618ea9bd0 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java @@ -232,11 +232,11 @@ public class PackController { @PutMapping("/unpacking") @Operation(summary = "拆包-更改包裹为未封包") @PreAuthorize("@ss.hasPermission('manage:pack:unpacking')") - public CommonResult unpacking(@Valid @RequestBody PackingReqVO reqVO) { + public CommonResult unpacking(@Valid @RequestBody PackingReqVO reqVO) { - packService.unpacking(reqVO.getPackageId()); + OrderPackRespVO unpacking = packService.unpacking(reqVO.getPackageId()); - return success(true); + return success(unpacking); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java index 0e9801914..e41ba0815 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java @@ -36,7 +36,7 @@ public interface OrderPackageMapper extends BaseMapperX { - List selectPackPage(/*@Param("page") IPage page,*/@Param("collect") List collect); + List selectPackPage(@Param("collect") List collect); IPage selectMissingBoard( @Param("page") IPage page, @Param("orderNo") Long orderNo, @Param("organId") Long organId); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 337d46310..2919c8113 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -233,11 +233,12 @@ public class PackServiceImpl implements PackService { // 拆包 @Override - public void unpacking(Long packageID) { + public OrderPackRespVO unpacking(Long packageID) { OrderPackageDO packageDO = orderPackageMapper.selectById(packageID); packageDO.setStatus((OrderPackageStatusEnum.UNPACKED.getStatus())); orderPackageMapper.updateById(packageDO); + return typeConversion(packageDO); }