|
|
|
@ -1049,12 +1049,17 @@ public class BusinessOrderController {
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Operation(summary = "获取采购合同列表(携带商品ids)")
|
|
|
|
|
@Operation(summary = "获取采购/销售合同列表(携带商品ids)")
|
|
|
|
|
@PostMapping("/contract/getPurchaseContractList")
|
|
|
|
|
public ActionResult list4(@RequestBody BusinessOrderPagination businessOrderPagination)throws IOException{
|
|
|
|
|
List<String> productIds = businessOrderPagination.getProductIds();
|
|
|
|
|
List<ContractLEntity> contractList = new ArrayList<>();
|
|
|
|
|
List<ContractLEntity> list= businessOrderService.queryPurchaseContractInfo(businessOrderPagination.getBusinessLineId());
|
|
|
|
|
List<ContractLEntity> list = new ArrayList<>();
|
|
|
|
|
if (StringUtils.isNotEmpty(businessOrderPagination.getContractType()) && businessOrderPagination.getContractType().equals("1")) {
|
|
|
|
|
list = businessOrderService.queryPurchaseContractInfo(businessOrderPagination.getBusinessLineId());
|
|
|
|
|
}else {
|
|
|
|
|
list = businessOrderService.querySaleContractInfo(businessOrderPagination.getBusinessLineId());
|
|
|
|
|
}
|
|
|
|
|
for (ContractLEntity entity : list){
|
|
|
|
|
List<String> productByContract = new ArrayList<>();
|
|
|
|
|
List<ProductByContractModel> productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId());
|
|
|
|
@ -1068,7 +1073,7 @@ public class BusinessOrderController {
|
|
|
|
|
}
|
|
|
|
|
entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
|
QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstSupplyId());
|
|
|
|
|
subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
|
|
|
|
|
List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
|
|
|
|
|
entity.setSubjectbasicEntityList(subjectbasicEntityList);
|
|
|
|
|
}
|
|
|
|
|