|
|
@ -102,6 +102,17 @@ public class CollectionController {
|
|
|
|
return ActionResult.success(result);
|
|
|
|
return ActionResult.success(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 合同信息
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param code
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@GetMapping("/contractShow")
|
|
|
|
|
|
|
|
public ActionResult contractShow(@Param("code") String code) {
|
|
|
|
|
|
|
|
List<ContractFileEntity> contractList = collectionService.queryContractInfo(code);
|
|
|
|
|
|
|
|
return ActionResult.success(contractList);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 选完合同,默认显示订单信息
|
|
|
|
* 选完合同,默认显示订单信息
|
|
|
@ -204,6 +215,7 @@ public class CollectionController {
|
|
|
|
// saleordercetEntity.setStatus("3");
|
|
|
|
// saleordercetEntity.setStatus("3");
|
|
|
|
saleorderitemService.updateById(saleordercetEntity);
|
|
|
|
saleorderitemService.updateById(saleordercetEntity);
|
|
|
|
collectionEntity.setStatus("2");
|
|
|
|
collectionEntity.setStatus("2");
|
|
|
|
|
|
|
|
collectionEntity.setBusinessDate(new Date());
|
|
|
|
collectionService.updateById(collectionEntity);
|
|
|
|
collectionService.updateById(collectionEntity);
|
|
|
|
return ActionResult.success("认款成功");
|
|
|
|
return ActionResult.success("认款成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -498,7 +510,7 @@ public class CollectionController {
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
|
|
|
|
jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
|
|
|
|
jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
|
|
|
|
jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
|
|
|
|
jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
|
|
|
|
// jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
|
|
|
|
jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
|
|
|
|
jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
|
|
|
|
jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
|
|
|
|
jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
|
|
|
|
jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
|
|
|
|
jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
|
|
|
|