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

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

Browse Source
This commit is contained in:
潘荣晟
2025-10-30 18:03:41 +08:00
parent 90e145a4ad ff987c3397
commit 8287b0aa25
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; 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.framework.common.pojo.CommonResult.success;
import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL;
@Slf4j @Slf4j
@Tag(name = "管理后台 - 合同管理") @Tag(name = "管理后台 - 合同管理")
@@ -146,7 +148,8 @@ public class ContractController implements BusinessControllerMarker {
@Operation(summary = "提交ERP") @Operation(summary = "提交ERP")
@PreAuthorize("@ss.hasPermission('base:contract:erp')") @PreAuthorize("@ss.hasPermission('base:contract:erp')")
public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) { 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") @GetMapping("/list/up-not-relation")

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

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