|
|
|
@ -225,6 +225,14 @@ public class SaleorderitemController {
|
|
|
|
|
QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
|
|
|
|
|
BigDecimal amount = new BigDecimal(0);
|
|
|
|
|
BigDecimal quantity = new BigDecimal(0);
|
|
|
|
|
for (Arinvoices_item1Entity entity : list1){
|
|
|
|
|
amount = amount.add(entity.getAmount());
|
|
|
|
|
quantity = quantity.add(entity.getQuantity());
|
|
|
|
|
}
|
|
|
|
|
arinvoicesEntity.setAmount(amount);
|
|
|
|
|
arinvoicesEntity.setQuantity(quantity);
|
|
|
|
|
arinvoicesEntity.setList0(list0);
|
|
|
|
|
arinvoicesEntity.setList1(list1);
|
|
|
|
|
return ActionResult.success(arinvoicesEntity);
|
|
|
|
@ -707,7 +715,7 @@ public class SaleorderitemController {
|
|
|
|
|
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
|
|
|
|
|
Map<String,Object> vehicleIdMap = new HashMap<>();
|
|
|
|
|
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
|
|
|
|
|
Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
|
Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
|
jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
|
|
|
|
|
}
|
|
|
|
|
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
|
|
|
|
|