Commit a20943c90698397b31016b56c10bf31f72efba79
Merge remote-tracking branch 'origin/master_0929' into master_0929
Showing
2 changed files
with
3 additions
and
3 deletions
| ... | ... | @@ -276,7 +276,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde |
| 276 | 276 | getBaseMapper().update(updateWrapper); |
| 277 | 277 | |
| 278 | 278 | //更新订货单表物料行 |
| 279 | - List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList = vo.getUpdatePurchaseOrderLineVoList(); | |
| 279 | + List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList = vo.getPurchaseOrderLineList(); | |
| 280 | 280 | if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) { |
| 281 | 281 | for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) { |
| 282 | 282 | purchaseOrderLineService.update(updatePurchaseOrderLineVo); |
| ... | ... | @@ -327,7 +327,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde |
| 327 | 327 | getBaseMapper().update(updateWrapper); |
| 328 | 328 | |
| 329 | 329 | //更新订货单表物料行 |
| 330 | - List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList = vo.getUpdatePurchaseOrderLineVoList(); | |
| 330 | + List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList = vo.getPurchaseOrderLineList(); | |
| 331 | 331 | if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) { |
| 332 | 332 | for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) { |
| 333 | 333 | purchaseOrderLineService.update(updatePurchaseOrderLineVo); | ... | ... |
| ... | ... | @@ -202,7 +202,7 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable { |
| 202 | 202 | * 订货单表物料行 |
| 203 | 203 | */ |
| 204 | 204 | @ApiModelProperty("订货单表物料行") |
| 205 | - private List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList; | |
| 205 | + private List<UpdatePurchaseOrderLineVo> purchaseOrderLineList; | |
| 206 | 206 | |
| 207 | 207 | /** |
| 208 | 208 | * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION） | ... | ... |