fix(purchase): 修复采购退库和采购入库单生成逻辑- 在 ProxyPurchaseReturn 和 ProxyPurchaseWarehousWarehouse 类中,修正了返回错误明细行的问题
- 将返回固定的第一条明细行改为返回匹配的明细行 - 更新了测试用例中的采购单号
This commit is contained in:
parent
a21799fa9b
commit
7516fa3196
|
@ -934,10 +934,10 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
|
||||||
if (ofsPoOrderDataDetails != null && ofsPoOrderDataDetails.size() > 0 && detailsDto != null) {
|
if (ofsPoOrderDataDetails != null && ofsPoOrderDataDetails.size() > 0 && detailsDto != null) {
|
||||||
for (int i = 0; i < ofsPoOrderDataDetails.size(); i++) {
|
for (int i = 0; i < ofsPoOrderDataDetails.size(); i++) {
|
||||||
Assert.notNull(ofsPoOrderDataDetails.get(i).getId(), "采退订单明细行主键不能为空!");
|
Assert.notNull(ofsPoOrderDataDetails.get(i).getId(), "采退订单明细行主键不能为空!");
|
||||||
|
|
||||||
Assert.notNull(detailsDto.getRefOrderDetailId(), "采退出库单明细行对应的关联采退订单的明细行主键不能为空!");
|
Assert.notNull(detailsDto.getRefOrderDetailId(), "采退出库单明细行对应的关联采退订单的明细行主键不能为空!");
|
||||||
|
|
||||||
if (ofsPoOrderDataDetails.get(i).getId().equals(detailsDto.getRefOrderDetailId())) {
|
if (ofsPoOrderDataDetails.get(i).getId().equals(detailsDto.getRefOrderDetailId())) {
|
||||||
return ofsPoOrderDataDetails.get(0);
|
return ofsPoOrderDataDetails.get(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -929,8 +929,9 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
|
||||||
for (int i = 0; i < ofsPoOrderDataDetails.size(); i++) {
|
for (int i = 0; i < ofsPoOrderDataDetails.size(); i++) {
|
||||||
Assert.notNull(ofsPoOrderDataDetails.get(i).getId(), "采购订单明细行主键不能为空!");
|
Assert.notNull(ofsPoOrderDataDetails.get(i).getId(), "采购订单明细行主键不能为空!");
|
||||||
Assert.notNull(stockinB.getRefOrderDetailId(), "采购入库单明细行对应的关联采购订单的明细行主键不能为空!");
|
Assert.notNull(stockinB.getRefOrderDetailId(), "采购入库单明细行对应的关联采购订单的明细行主键不能为空!");
|
||||||
|
|
||||||
if (ofsPoOrderDataDetails.get(i).getId().equals(stockinB.getRefOrderDetailId())) {
|
if (ofsPoOrderDataDetails.get(i).getId().equals(stockinB.getRefOrderDetailId())) {
|
||||||
return ofsPoOrderDataDetails.get(0);
|
return ofsPoOrderDataDetails.get(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -26,6 +26,6 @@ public class ProxyPurchaseWarehousWarehouseTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void startImplementByCode() {
|
public void startImplementByCode() {
|
||||||
proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2025010200000596");
|
proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2024123100000763");
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue