Browse Source

feat(notify): 优化物料列表查询功能

- 在SOIssueNotifyOrderMaterialList实体中新增partNo、partQuery、partDesc、lotSize字段
- 添加isInWh和availableQty字段用于库存状态管理
- 实现PartAttributeAware接口以支持零件属性查询
- 优化partQuery字段赋值逻辑,优先使用componentPartNo作为查询条件
- 集成partAttributeUtil工具批量填充isInWh和availableQty字段
- 移除调试相关的System.out.println代码
master
常熟吴彦祖 24 hours ago
parent
commit
0f43321b90
  1. 25
      src/main/java/com/gaotao/modules/notify/controller/IssureNotifyController.java
  2. 43
      src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialList.java

25
src/main/java/com/gaotao/modules/notify/controller/IssureNotifyController.java

@ -433,6 +433,31 @@ public class IssureNotifyController {
@ResponseBody
public R getNoOrderMaterialList(@RequestBody SOIssueNotifyOrderMaterialList data) {
List<NoOrderMaterialListVo> rows = issureNotifyService.getNoOrderMaterialList(data);
// 设置partQuery字段用于查询 - rqrq
for (NoOrderMaterialListVo row : rows) {
// 优化确保partQuery有值优先使用componentPartNo - rqrq
if (row.getPartQuery() == null || row.getPartQuery().isEmpty()) {
if (row.getComponentPartNo() != null && !row.getComponentPartNo().isEmpty()) {
row.setPartQuery(row.getComponentPartNo());
} else if (row.getPartNo() != null && !row.getPartNo().isEmpty()) {
row.setPartQuery(row.getPartNo());
}
}
}
// 批量填充isInWh和availableQty字段 - rqrq
partAttributeUtil.fillIsInWh(rows);
// System.out.println("getNoOrderMaterialList返回数据,共" + rows.size() + "条 - rqrq");
// if (!rows.isEmpty()) {
// NoOrderMaterialListVo first = rows.get(0);
// System.out.println("第一条数据:componentPartNo=" + first.getComponentPartNo()
// + ", partQuery=" + first.getPartQuery()
// + ", isInWh=" + first.getIsInWh()
// + ", availableQty=" + first.getAvailableQty() + " - rqrq");
// }
return R.ok().put("rows", rows);
}

43
src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialList.java

@ -2,13 +2,14 @@ package com.gaotao.modules.notify.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.gaotao.common.utils.PartAttributeAware;
import lombok.Data;
import java.math.BigDecimal;
@Data
@TableName(value = "SOIssueNotifyOrderMaterialList")
public class SOIssueNotifyOrderMaterialList {
public class SOIssueNotifyOrderMaterialList implements PartAttributeAware {
/**
*
*/
@ -55,5 +56,45 @@ public class SOIssueNotifyOrderMaterialList {
private String orderType;
private String batchNo;
private BigDecimal qtyIssuedHis;
private String partNo;
private String partQuery;
private String partDesc;
private int lotSize;
/**
* 是否进立库标识Y=, N=- rqrq
*/
private String isInWh;
/**
* 可用库存数量 - rqrq
*/
private BigDecimal availableQty;
@Override
public String getPartQuery() {
// 优先使用partQuery其次componentPartNo最后partNo - rqrq
if (partQuery != null && !partQuery.isEmpty()) {
return partQuery;
}
if (componentPartNo != null && !componentPartNo.isEmpty()) {
return componentPartNo;
}
return partNo;
}
@Override
public void setIsInWh(String isInWh) {
this.isInWh = isInWh; // 修复实际设置字段 - rqrq
}
@Override
public void setAvailableQty(BigDecimal availableQty) {
this.availableQty = availableQty; // 修复实际设置字段 - rqrq
}
}
Loading…
Cancel
Save