feat(transfer): 添加调拨订单项确认功能中的订单项ID参数支持
- 在confirmTransfer方法中添加orderItemId参数获取 - 更新查询条件以支持根据订单项ID进行筛选 - 添加对orderItemId和transferId为null的安全检查 - 优化查询包装器的条件判断逻辑
This commit is contained in:
@@ -403,6 +403,7 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
|
|||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Boolean confirmTransfer(WmsTransferOrderItemBo bo) {
|
public Boolean confirmTransfer(WmsTransferOrderItemBo bo) {
|
||||||
Long transferId = bo.getTransferId();
|
Long transferId = bo.getTransferId();
|
||||||
|
Long orderItemId = bo.getOrderItemId();
|
||||||
Long coilId = bo.getCoilId();
|
Long coilId = bo.getCoilId();
|
||||||
Long itemId = bo.getItemIdAfter();
|
Long itemId = bo.getItemIdAfter();
|
||||||
String itemType = bo.getMaterialTypeAfter() != null ? (bo.getMaterialTypeAfter() == 1 ? "raw_material" : "product") : null;
|
String itemType = bo.getMaterialTypeAfter() != null ? (bo.getMaterialTypeAfter() == 1 ? "raw_material" : "product") : null;
|
||||||
@@ -430,8 +431,9 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
|
|||||||
coilMapper.updateById(coil);
|
coilMapper.updateById(coil);
|
||||||
|
|
||||||
LambdaQueryWrapper<WmsTransferOrderItem> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<WmsTransferOrderItem> wrapper = new LambdaQueryWrapper<>();
|
||||||
wrapper.eq(WmsTransferOrderItem::getCoilId, coilId);
|
wrapper.eq(true, WmsTransferOrderItem::getCoilId, coilId);
|
||||||
wrapper.eq(WmsTransferOrderItem::getTransferId, transferId);
|
wrapper.eq(orderItemId != null, WmsTransferOrderItem::getOrderItemId, orderItemId);
|
||||||
|
wrapper.eq(transferId != null, WmsTransferOrderItem::getTransferId, transferId);
|
||||||
WmsTransferOrderItem item = baseMapper.selectOne(wrapper);
|
WmsTransferOrderItem item = baseMapper.selectOne(wrapper);
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
// 如果没传itemIdAfter则用itemIdBefore的值
|
// 如果没传itemIdAfter则用itemIdBefore的值
|
||||||
|
|||||||
Reference in New Issue
Block a user