yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算重量修改

Browse Source
product
杨世强 1 year ago
parent 88e02aaa29
commit b07ffc8004
2 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File

19
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -534,9 +534,8 @@ public class SaleorderitemController {
}
@Transactional
public void settlement(List<Salesorder_item0Entity> salesorderItem0List) throws DataException {
for (Salesorder_item0Entity entity : salesorderItem0List){
PoundlistEntity poundlistEntity = poundlistService.getInfo(entity.getPoundlistId());
public void settlement(Salesorder_item0Entity salesorderItem0Entity) throws DataException {
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorderItem0Entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
//磅单调整
PoundlistEntity poundlistEntityCopy = new PoundlistEntity();
@ -544,14 +543,15 @@ public class SaleorderitemController {
String mainId = RandomUtil.uuId();
poundlistEntityCopy.setSalesStatus("99");
poundlistEntityCopy.setSalesorderId(null);
BigDecimal newSettlement = poundlistEntity.getSettlement().subtract(entity.getSettlement());
BigDecimal newSettlement = poundlistEntity.getSettlement().subtract(salesorderItem0Entity.getSettlement());
poundlistEntityCopy.setSettlement(newSettlement);
poundlistEntityCopy.setPurchaseAmounts(poundlistEntity.getPurchasePrice().multiply(newSettlement).setScale(2, BigDecimal.ROUND_HALF_UP));
poundlistEntityCopy.setSalesAmounts(poundlistEntity.getSalesPrice().multiply(newSettlement).setScale(2, BigDecimal.ROUND_HALF_UP));
poundlistEntityCopy.setSourceId(poundlistEntity.getId());
poundlistEntityCopy.setId(mainId);
poundlistEntityCopy.setPoundlistNo(poundlistEntity.getPoundlistNo() + "-1");
poundlistService.save(poundlistEntityCopy);
poundlistEntity.setSettlement(entity.getSettlement());
poundlistEntity.setSettlement(salesorderItem0Entity.getSettlement());
poundlistEntity.setPurchaseAmounts(poundlistEntity.getPurchaseAmounts().subtract(poundlistEntityCopy.getPurchaseAmounts().setScale(2, BigDecimal.ROUND_HALF_UP)));
poundlistService.updateById(poundlistEntity);
//采购订单调整
@ -561,7 +561,7 @@ public class SaleorderitemController {
if (ObjectUtils.isNotEmpty(purchaseorder_item0Entity)) {
Purchaseorder_item0Entity purchaseorder_item0EntityCopy = new Purchaseorder_item0Entity();
BeanUtils.copyProperties(purchaseorder_item0Entity, purchaseorder_item0EntityCopy);
purchaseorder_item0Entity.setSettlement(entity.getSettlement());
purchaseorder_item0Entity.setSettlement(salesorderItem0Entity.getSettlement());
purchaseorder_item0Entity.setAmount(poundlistEntity.getPurchaseAmounts());
switch (purchaseorder_item0Entity.getRate()) {
case "1":
@ -617,7 +617,7 @@ public class SaleorderitemController {
if (ObjectUtils.isNotEmpty(receiptin_item0Entity)) {
Receiptin_item0Entity receiptin_item0EntityCopy = new Receiptin_item0Entity();
BeanUtils.copyProperties(receiptin_item0Entity, receiptin_item0EntityCopy);
receiptin_item0Entity.setNum(entity.getSettlement());
receiptin_item0Entity.setNum(salesorderItem0Entity.getSettlement());
receiptin_item0Entity.setAmount(purchaseorder_item0Entity.getAmount());
receiptin_item0Entity.setRateamount(purchaseorder_item0Entity.getAmount().subtract(purchaseorder_item0Entity.getNotAmount().setScale(2, BigDecimal.ROUND_HALF_UP)));
receiptin_item0Service.updateById(receiptin_item0Entity);
@ -644,7 +644,6 @@ public class SaleorderitemController {
}
}
}
}
/**
* 创建
@ -682,7 +681,7 @@ public class SaleorderitemController {
return ActionResult.fail(vehicleEntity.getTicketno() + "结算重量最多只能为" + poundlistEntity.getSettlement());
}
}else if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) < 0){
settlement(Salesorder_item0List);
settlement(salesorder_item0Entity);
}
}
}
@ -1233,7 +1232,7 @@ public class SaleorderitemController {
return ActionResult.fail(vehicleEntity.getTicketno() + "结算重量最多只能为" + poundlistEntity.getSettlement());
}
}else if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) < 0){
settlement(Salesorder_item0List);
settlement(salesorder_item0Entity);
}
}
}

1
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -921,6 +921,7 @@
this.dataForm.num = settlement
this.dataForm.price = price
this.dataForm.notPrice = notPrice
this.dataForm.rate = this.jnpf.floatSub(price,notPrice);
},
computeNoPrice() {
let notPrice = 0;

Write Preview
Loading…
Cancel
Save