feat(wms): 添加钢卷关联订单信息查询功能
- 在WmsCoilContractRelMapper中新增selectOrdersByCoilId和selectOrdersByCoilIds方法 - 在WmsCoilContractRelMapper.xml中实现钢卷与订单关联查询的SQL映射 - 扩展WmsCoilContractRelVo类添加订单相关字段和@JsonFormat注解 - 在WmsMaterialCoilServiceImpl中注入coilContractRelMapper并实现填充订单信息逻辑 - 在WmsMaterialCoilVo中添加orderList字段存储关联订单列表 - 实现根据钢卷ID查询完整订单信息的JOIN查询功能
This commit is contained in:
@@ -26,6 +26,7 @@ import com.klp.domain.vo.dashboard.CategoryWidthRawVo;
|
||||
import com.klp.domain.WmsCoilPendingAction;
|
||||
import com.klp.domain.bo.WmsCoilPendingActionBo;
|
||||
import com.klp.mapper.*;
|
||||
import com.klp.service.*;
|
||||
import com.klp.system.service.ISysUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -33,16 +34,6 @@ import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.klp.service.IWmsMaterialCoilService;
|
||||
import com.klp.service.IWmsStockService;
|
||||
import com.klp.service.IWmsGenerateRecordService;
|
||||
import com.klp.service.IWmsWarehouseService;
|
||||
import com.klp.service.IWmsActualWarehouseService;
|
||||
import com.klp.service.IWmsRawMaterialService;
|
||||
import com.klp.service.IWmsBomItemService;
|
||||
import com.klp.service.IWmsCoilPendingActionService;
|
||||
import com.klp.service.IWmsProductService;
|
||||
import com.klp.service.IWmsCoilAbnormalService;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
import java.util.*;
|
||||
@@ -80,6 +71,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
private final WmsDeliveryWaybillDetailMapper deliveryWaybillDetailMapper;
|
||||
private final WmsCoilWarehouseOperationLogMapper wmsCoilWarehouseOperationLogMapper;
|
||||
private final IWmsCoilAbnormalService coilAbnormalService;
|
||||
private final WmsCoilContractRelMapper coilContractRelMapper;
|
||||
|
||||
/**
|
||||
* 查询钢卷物料表
|
||||
@@ -94,6 +86,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
// 查询关联对象
|
||||
fillRelatedObjects(vo);
|
||||
|
||||
// 查询钢卷关联的订单信息
|
||||
fillOrderListForSingle(coilId, vo);
|
||||
|
||||
return vo;
|
||||
}
|
||||
|
||||
@@ -304,6 +299,21 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 查询合同信息通过中间表拿到合同id然后查询出合同信息
|
||||
}
|
||||
|
||||
/**
|
||||
* 填充单个钢卷的关联订单列表(完整WmsCoilContractRelVo,含JOIN订单信息)
|
||||
*/
|
||||
private void fillOrderListForSingle(Long coilId, WmsMaterialCoilVo vo) {
|
||||
try {
|
||||
List<com.klp.domain.vo.WmsCoilContractRelVo> orders = coilContractRelMapper.selectOrdersByCoilId(coilId);
|
||||
if (orders != null && !orders.isEmpty()) {
|
||||
vo.setOrderList(orders);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("查询钢卷关联订单信息失败, coilId: {}", coilId, e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user