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

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

@@ -21,7 +21,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 = "管理后台 - 合同管理")
@@ -146,7 +148,8 @@ public class ContractController implements BusinessControllerMarker {
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
     public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) {
-        return success(contractService.submitErp(id));
+        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")

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

@@ -204,6 +204,7 @@ public class PrchOrdDtlRespVO {
     @Schema(description = "金属元素编码")
     @ExcelProperty("金属元素编码")
     private String elemCdg;
+
     @Schema(description = "税率")
     private BigDecimal taxRte;
 }