Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2024-09-29 18:25:15 +08:00
parent dcab45d2a1 e5d91f7e22
commit 86130098f8
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
+10
View File
@@ -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);
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+1
View File
@@ -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, "生产单信息错误，请重新进行拆包");