diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java index 02217758..821fa3de 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java @@ -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 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") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index d304cede..47fcd089 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -1628,6 +1628,7 @@ public class ContractServiceImpl implements ContractService { // TODO 暂时返回成功 erpResult.putOnce("success", true); + erpResult.putOnce("data", "success"); /*HashMap result = erpContractService.submitErp(erpContractVO); if ("E".equals(result.get("flag"))) { erpResult.putOnce("success", false);