zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-11-19 17:58:18 +08:00
parent 7e282e80e4 cff5a9d31d
commit b337a9412c
5 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java
View File

@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.zt.plat.framework.common.pojo.CommonResult.error;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL;
@Slf4j
@Tag(name = "管理后台 - 合同管理")
@@ -153,10 +155,8 @@ public class ContractController implements BusinessControllerMarker {
@Operation(summary = "提交ERP")
@PreAuthorize("@ss.hasPermission('base:contract:erp')")
public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) {
// JSONObject res = contractService.submitErp(id);
// return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data"));
// TODO ERP默认返回成功处理 SZHGYL-251
return success(new JSONObject().putOnce("success", true));
JSONObject res = contractService.submitErp(id);
return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data"));
}
@GetMapping("/list/up-not-relation")

20
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -1193,6 +1193,11 @@ public class ContractServiceImpl implements ContractService {
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
}
// 未查询到相关合同
if (CollectionUtils.isEmpty(contractIds)) {
return new PageResult<>();
}
// 分页查询
IPage<NotRespVO> ipage = contractNotMapper.selectNots(
new Page<NotRespVO>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
@@ -1215,6 +1220,11 @@ public class ContractServiceImpl implements ContractService {
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
}
// 未查询到相关合同
if (CollectionUtils.isEmpty(contractIds)) {
return new PageResult<>();
}
// 分页查询
IPage<DemoteRespVO> ipage = contractDemoteMapper.selectDemotes(
new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
@@ -1237,6 +1247,11 @@ public class ContractServiceImpl implements ContractService {
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
}
// 未查询到相关合同
if (CollectionUtils.isEmpty(contractIds)) {
return new PageResult<>();
}
// 分页查询
IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas(
new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
@@ -1628,6 +1643,7 @@ public class ContractServiceImpl implements ContractService {
// TODO 暂时返回成功
erpResult.putOnce("success", true);
erpResult.putOnce("data", "success");
/*HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
if ("E".equals(result.get("flag"))) {
erpResult.putOnce("success", false);
@@ -1836,7 +1852,7 @@ public class ContractServiceImpl implements ContractService {
infoRespVO.setCompanyBankAccount(contractMainDO.getSalesBankAccount());
infoRespVO.setCompanyAccountNumber(contractMainDO.getSalesAccountNumber());
infoRespVO.setCompanyTaxNumber(contractMainDO.getSalesTaxNumber());
infoRespVO.setSupplierName(contractMainDO.getPurchaseCompanyNumber());
infoRespVO.setSupplierNumber(contractMainDO.getPurchaseCompanyNumber());
infoRespVO.setSupplierName(contractMainDO.getPurchaseCompanyName());
infoRespVO.setSupplierAccountName(contractMainDO.getPurchaseAccountName());
infoRespVO.setSupplierBankAccount(contractMainDO.getPurchaseBankAccount());
@@ -1850,7 +1866,7 @@ public class ContractServiceImpl implements ContractService {
infoRespVO.setCompanyBankAccount(contractMainDO.getPurchaseBankAccount());
infoRespVO.setCompanyAccountNumber(contractMainDO.getPurchaseAccountNumber());
infoRespVO.setCompanyTaxNumber(contractMainDO.getPurchaseTaxNumber());
infoRespVO.setSupplierName(contractMainDO.getSalesCompanyNumber());
infoRespVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber());
infoRespVO.setSupplierName(contractMainDO.getSalesCompanyName());
infoRespVO.setSupplierAccountName(contractMainDO.getSalesAccountName());
infoRespVO.setSupplierBankAccount(contractMainDO.getSalesBankAccount());