TODO 接口添加说明
其它附件对象存储请求字段类型修改 提交erp客商名称字段修改
This commit is contained in:
@@ -100,28 +100,28 @@ public class ContractController implements BusinessControllerMarker {
|
||||
|
||||
// TODO
|
||||
@PostMapping("/download")
|
||||
@Operation(summary = "下载文件")
|
||||
@Operation(summary = "下载文件 TODO")
|
||||
@PreAuthorize("@ss.hasPermission('base:contract:download')")
|
||||
public void download() {
|
||||
}
|
||||
|
||||
// TODO
|
||||
@PostMapping("/preview")
|
||||
@Operation(summary = "预览文件")
|
||||
@Operation(summary = "预览文件 TODO")
|
||||
@PreAuthorize("@ss.hasPermission('base:contract:preview')")
|
||||
public void preview() {
|
||||
}
|
||||
|
||||
// TODO
|
||||
@PostMapping("/complete")
|
||||
@Operation(summary = "完结")
|
||||
@Operation(summary = "完结 TODO")
|
||||
@PreAuthorize("@ss.hasPermission('base:contract:complete')")
|
||||
public void complete() {
|
||||
}
|
||||
|
||||
// TODO
|
||||
@PostMapping("/archive")
|
||||
@Operation(summary = "归档")
|
||||
@Operation(summary = "归档 TODO")
|
||||
@PreAuthorize("@ss.hasPermission('base:contract:archive')")
|
||||
public void archive() {
|
||||
}
|
||||
@@ -135,7 +135,7 @@ public class ContractController implements BusinessControllerMarker {
|
||||
|
||||
// TODO
|
||||
@PostMapping("/approval")
|
||||
@Operation(summary = "合同审批")
|
||||
@Operation(summary = "合同审批 TODO")
|
||||
@PreAuthorize("@ss.hasPermission('base:contract:approval')")
|
||||
public CommonResult<String> approval(@Valid @RequestBody ApprovalReqVO reqVO) {
|
||||
return success(contractService.approval(reqVO));
|
||||
@@ -143,7 +143,7 @@ public class ContractController implements BusinessControllerMarker {
|
||||
|
||||
// TODO
|
||||
@PostMapping("/view/approval")
|
||||
@Operation(summary = "查看审批")
|
||||
@Operation(summary = "查看审批 TODO")
|
||||
@PreAuthorize("@ss.hasPermission('base:contract:approval')")
|
||||
public void viewApproval() {
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
|
||||
|
||||
import cn.hutool.json.JSONArray;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataSaveReqVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -34,7 +35,7 @@ public class ContractSaveReqVO {
|
||||
private String fileObject;
|
||||
|
||||
@Schema(description = "其它附件对象存储")
|
||||
private String fileObjectOther;
|
||||
private JSONArray fileObjectOther;
|
||||
|
||||
// 合同基本信息
|
||||
@Schema(description = "甲方公司编号;如果是采购合同,查询组织机构自动带出,且与ERP(HTQDZTBH)对应,如果是销售合同,手动选择,且与ERP(WLDWBH)对应。", example = "甲方公司编号")
|
||||
|
||||
@@ -1232,22 +1232,22 @@ public class ContractServiceImpl implements ContractService {
|
||||
// 客商编号:SPLR_NUM 根据合同主表的收支方向判断,如果为“支出”,值为“ERP乙方公司编码”,反之为“ERP甲方公司编码”
|
||||
// 客商名称:SPLR_NAME 根据合同主表的收支方向判断,如果为“支出”,值为“ERP乙方公司名称”,反之为“ERP甲方公司名称”
|
||||
if (DictEnum.ERP_RCV_DLVY_EXPENSES.getCode().equals(contractMainDO.getDirection())) {
|
||||
erpContractVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber());
|
||||
erpContractVO.setSupplierName(contractMainDO.getSalesCompanyName());
|
||||
erpContractVO.setSupplierNumber(contractMainDO.getErpSalesCompanyNumber());
|
||||
erpContractVO.setSupplierName(contractMainDO.getErpSalesCompanyName());
|
||||
} else if (DictEnum.ERP_RCV_DLVY_INCOME.getCode().equals(contractMainDO.getDirection())) {
|
||||
erpContractVO.setSupplierNumber(contractMainDO.getPurchaseCompanyNumber());
|
||||
erpContractVO.setSupplierName(contractMainDO.getPurchaseCompanyName());
|
||||
erpContractVO.setSupplierNumber(contractMainDO.getErpPurchaseCompanyNumber());
|
||||
erpContractVO.setSupplierName(contractMainDO.getErpPurchaseCompanyName());
|
||||
}
|
||||
// 代理方:AGT
|
||||
erpContractVO.setAgent(contractMainDO.getAgent());
|
||||
// 合同实施主体编号:CTRT_IMPL_NUM 根据合同主表的收支方向判断,如果为“支出”,值为“ERP甲方公司编码”,反之为“ERP乙方公司编码”
|
||||
// 合同签订主体编号:CTRT_SGN_NUM 根据合同主表的收支方向判断,如果为“支出”,值为“ERP甲方公司名称”,反之为“ERP乙方公司名称”
|
||||
if (DictEnum.ERP_RCV_DLVY_EXPENSES.getCode().equals(contractMainDO.getDirection())) {
|
||||
erpContractVO.setContractImplementNumber(contractMainDO.getPurchaseCompanyNumber());
|
||||
erpContractVO.setContractSignNumber(contractMainDO.getPurchaseCompanyName());
|
||||
erpContractVO.setContractImplementNumber(contractMainDO.getErpPurchaseCompanyNumber());
|
||||
erpContractVO.setContractSignNumber(contractMainDO.getErpPurchaseCompanyName());
|
||||
} else if (DictEnum.ERP_RCV_DLVY_INCOME.getCode().equals(contractMainDO.getDirection())) {
|
||||
erpContractVO.setContractImplementNumber(contractMainDO.getSalesCompanyNumber());
|
||||
erpContractVO.setContractSignNumber(contractMainDO.getSalesCompanyName());
|
||||
erpContractVO.setContractImplementNumber(contractMainDO.getErpSalesCompanyNumber());
|
||||
erpContractVO.setContractSignNumber(contractMainDO.getErpSalesCompanyName());
|
||||
}
|
||||
// 合同签订日期:SGN_DT
|
||||
if (contractMainDO.getSignDate() != null) {
|
||||
|
||||
Reference in New Issue
Block a user