refactor(wms): 优化入库单相关代码

- 在 WmsAllocateOrder 和 WmsAllocateOrderDetail 类中,为 @TableId 注解添加 value属性
- 修复 WmsInstockOrderServiceImpl 中保存入库单逻辑的问题
- 优化入库单明细列表中入库单 ID 的设置方式
master
zangch@mesnac.com 1 day ago
parent 3ced8e35df
commit 64496f4d31

@ -22,7 +22,7 @@ public class WmsAllocateOrder{
/** /**
* *
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO, value = "ao_id")
private Long aoId; private Long aoId;
/** /**

@ -1,9 +1,7 @@
package org.dromara.wms.domain; package org.dromara.wms.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -25,7 +23,7 @@ public class WmsAllocateOrderDetail {
/** /**
* *
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO, value = "ao_d_id")
private Long aoDId; private Long aoDId;
/** /**

@ -7,6 +7,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -205,6 +206,9 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
if (flag) { if (flag) {
bo.setInstockId(add.getInstockId()); bo.setInstockId(add.getInstockId());
} }
if (ObjectUtils.isEmpty(bo.getInstockId())) {
throw new ServiceException("入库单保存失败");
}
MPJLambdaWrapper<WmsInstockOrder> addOne = buildQueryWrapper(bo); MPJLambdaWrapper<WmsInstockOrder> addOne = buildQueryWrapper(bo);
WmsInstockOrderVo orderVo = baseMapper.selectVoOne(addOne); WmsInstockOrderVo orderVo = baseMapper.selectVoOne(addOne);
// // 设置生成的主键ID // // 设置生成的主键ID
@ -214,7 +218,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
if (bo.getDetailListBo() != null && !bo.getDetailListBo().isEmpty()) { if (bo.getDetailListBo() != null && !bo.getDetailListBo().isEmpty()) {
// 为每个明细设置入库单信息 // 为每个明细设置入库单信息
for (WmsInstockDetailBo detail : bo.getDetailListBo()) { for (WmsInstockDetailBo detail : bo.getDetailListBo()) {
detail.setInstockId(detail.getInstockId()); detail.setInstockId(bo.getInstockId());
detail.setInstockCode(inStockOrder); detail.setInstockCode(inStockOrder);
} }

Loading…
Cancel
Save