From e5d91f7e22ec300b73840b0a4d8e40ca2048c80b Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sun, 29 Sep 2024 17:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85=E6=8B=86?= =?UTF-8?q?=E5=8C=85=E6=95=B0=E6=8D=AE=E6=AD=A3=E7=A1=AE=E6=80=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manage/service/pack/PackServiceImpl.java | 10 ++++++++++ .../imes/module/system/enums/ErrorCodeConstants.java | 1 + 2 files changed, 11 insertions(+) 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 16c82418e..1dbd53388 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 @@ -455,12 +455,22 @@ public class PackServiceImpl implements PackService { // 拆包 @Override + @Transactional(rollbackFor = Exception.class) public OrderPackRespVO unpacking(Long packageID) { OrderPackageDO packageDO = orderPackageMapper.selectById(packageID); AssertUtils.notEmpty(packageDO,ORDER_PACK_DATA_ERROR ); + Long orderId = packageDO.getOrderId(); + + OrderDO orderDO = ordersMapper.selectById(orderId); + + AssertUtils.notEmpty(orderDO,ORDER_NO_DATA_ERROR); + + orderDO.setPackaged(OrderPackageStatusEnum.UNPACKED.getStatus()); + ordersMapper.updateById(orderDO); + packageDO.setStatus(OrderPackageStatusEnum.UNPACKED.getStatus()); orderPackageMapper.updateById(packageDO); return typeConversion(packageDO); diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index 1053bcb3a..a7065f462 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -302,6 +302,7 @@ public interface ErrorCodeConstants { ErrorCode ORDER_BODY_DATA_ERROR = new ErrorCode(1_002_041_012, "当前柜体对应的板材数据为空，无法删除"); ErrorCode ORDER_PLAN_NO_OPTIMIZE_ERROR = new ErrorCode(1_002_041_013, "当前排单还未保存优化结果，无法进行开料"); ErrorCode ORDER_PLAN_NO_OPTIMIZE_UPDATE_ERROR = new ErrorCode(1_002_041_014, "当前排单还未保存优化结果，无法对开料结果进行修改"); + ErrorCode ORDER_NO_DATA_ERROR = new ErrorCode(1_002_041_001, "生产单信息错误，请重新进行拆包");