删除合同接口、提erp接口

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java

@@ -22,4 +22,5 @@ public interface ErrorCodeConstants {
     ErrorCode CONTRACT_STATUS_NOT_SUBMIT_APPROVAL = new ErrorCode(1_027_000_007, "{}状态合同不允许提交审核");
     ErrorCode CONTRACT_STATUS_NOT_APPROVAL = new ErrorCode(1_027_000_008, "{}状态合同不允许审核");
     ErrorCode CONTRACT_ERP_COMPANY_PLEASE_BIND = new ErrorCode(1_027_000_009, "请先绑定{}ERP公司信息");
+    ErrorCode CONTRACT_STATUS_NOT_DELETE = new ErrorCode(1_027_000_010, "{}状态合同不允许删除");
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java

@@ -63,4 +63,8 @@ public enum DictEnum {
     public String getRemark() {
         return remark;
     }
+
+    public static DictEnum getByCode(String code, String dictType) {
+        return DictEnum.valueOf(dictType + "_" +code);
+    }
 }

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

@@ -85,13 +85,11 @@ public class ContractController implements BusinessControllerMarker {
         return success(contractService.update(reqVO));
     }
 
-    // TODO
     @DeleteMapping("/delete")
     @Operation(summary = "删除合同")
-    @Parameter(name = "ids", description = "合同ID集合", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('base:contract:delete')")
-    public CommonResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
+    public CommonResult<List<JSONObject>> delete(@RequestBody List<Long> ids) {
-        return success(true);
+        return success(contractService.delete(ids));
     }
 
     // TODO
@@ -144,11 +142,10 @@ public class ContractController implements BusinessControllerMarker {
     public void viewApproval() {
     }
 
-    // TODO
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
-    public void submitErp(@RequestBody List<Long> ids) {
+    public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
-        contractService.submitErp(ids);
+        return success(contractService.submitErp(ids));
     }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.service.contract;
 
+import cn.hutool.json.JSONObject;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
@@ -101,5 +102,13 @@ public interface ContractService {
      * @param ids 合同ID集合
      * @return
      */
-    void submitErp(List<Long> ids);
+    List<String> submitErp(List<Long> ids);
+
+    /**
+     * 删除合同
+     *
+     * @param ids 合同ID集合
+     * @return 删除结果
+     */
+    List<JSONObject> delete(List<Long> ids);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java

@@ -342,9 +342,7 @@ public class ErpContractServiceImpl implements ErpContractService {
 
         HashMap<String, String> response = erpExternalApi.submitDataToErp(erpSubmitReqDTO);
 
-        System.out.println(response.get("resStr"));
+        return response.get("resStr");
-
-        return "";
     }
 
     /**