|
|
@ -179,6 +179,13 @@ public class BusinessOrderController {
|
|
|
|
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
|
|
|
|
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (entity.getProfit().compareTo(BigDecimal.ZERO) <= 0){
|
|
|
|
|
|
|
|
BigDecimal purchaseAmount1 = voucherService.queryVoucherByBusinessOrderInfo2(entity.getId()); //采购订单总额
|
|
|
|
|
|
|
|
entity.setProfit(saleAmount.subtract(purchaseAmount1));//利润
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
|
|
|
|
Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
|
|
|
|
businessOrderMap.put("id", businessOrderMap.get("id"));
|
|
|
|
businessOrderMap.put("id", businessOrderMap.get("id"));
|
|
|
|
//副表数据
|
|
|
|
//副表数据
|
|
|
@ -1497,4 +1504,32 @@ public class BusinessOrderController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 列表
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@Operation(summary = "获取业务线合同")
|
|
|
|
|
|
|
|
@GetMapping("/getBusinessContractList")
|
|
|
|
|
|
|
|
public ActionResult businessContractList(@RequestParam("businessLine") String businessLine,@RequestParam("contractNumber") String contractNumber )throws IOException{
|
|
|
|
|
|
|
|
if (businessLine!=null && contractNumber!=null){
|
|
|
|
|
|
|
|
List<ContractLEntity> list= businessOrderService.queryBusinessContractInfo(businessLine,contractNumber);
|
|
|
|
|
|
|
|
for (ContractLEntity entity : list){
|
|
|
|
|
|
|
|
List<ProductByContractModel> productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId());
|
|
|
|
|
|
|
|
entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
|
|
|
|
QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
|
|
|
subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
|
|
|
|
|
|
|
|
List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
|
|
|
|
|
|
|
|
entity.setSubjectbasicEntityList(subjectbasicEntityList);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return ActionResult.success(list);
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
return ActionResult.success("没有合同或者业务线");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|