|
@@ -905,6 +905,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
|
|
|
if (inboundResponse.getReceivableId() != null) {
|
|
if (inboundResponse.getReceivableId() != null) {
|
|
|
accountService.reversePayable(inboundResponse.getIntoId(), Constant.InventoryDocCode.INTOBOUND.getTableName());
|
|
accountService.reversePayable(inboundResponse.getIntoId(), Constant.InventoryDocCode.INTOBOUND.getTableName());
|
|
|
}
|
|
}
|
|
|
|
|
+ //endregion
|
|
|
|
|
|
|
|
//region 编辑明细
|
|
//region 编辑明细
|
|
|
//校验明细
|
|
//校验明细
|
|
@@ -956,7 +957,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
|
|
|
//编辑之前的数
|
|
//编辑之前的数
|
|
|
inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
|
|
inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
|
|
|
inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
|
|
inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
|
|
|
- inboundItemVO.setAddOrEditFlag(false);
|
|
|
|
|
|
|
+ inboundItemVO.setAddOrEditFlag(true);
|
|
|
//endregion
|
|
//endregion
|
|
|
}
|
|
}
|
|
|
//endregion
|
|
//endregion
|
|
@@ -1098,7 +1099,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
|
|
|
PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId());
|
|
PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId());
|
|
|
//入库状态
|
|
//入库状态
|
|
|
String purIntoStatus = this.setIntoStatus(purchaseResponse.getIntoingQty().add(purchase.getIntoingQty()),
|
|
String purIntoStatus = this.setIntoStatus(purchaseResponse.getIntoingQty().add(purchase.getIntoingQty()),
|
|
|
- purchaseResponse.getIntoQty().add(purchase.getIntoQty()), purchase.getSumQuantity());
|
|
|
|
|
|
|
+ purchaseResponse.getIntoQty().add(purchase.getIntoQty()), purchaseResponse.getSumQuantity());
|
|
|
purchase.setIntoStatus(purIntoStatus);
|
|
purchase.setIntoStatus(purIntoStatus);
|
|
|
//修改
|
|
//修改
|
|
|
int countRow = purchaseMapper.updateById(purchase);
|
|
int countRow = purchaseMapper.updateById(purchase);
|
|
@@ -1120,7 +1121,6 @@ public class InboundPurchaseService extends BaseService<Inbound> {
|
|
|
inventoryService.operatingInventoryInformation(map);
|
|
inventoryService.operatingInventoryInformation(map);
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
|
- //endregion
|
|
|
|
|
return ResponseResultUtil.success(inboundVO);
|
|
return ResponseResultUtil.success(inboundVO);
|
|
|
}
|
|
}
|
|
|
|
|
|