Merge branch 'refs/heads/dev' into test

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

@@ -0,0 +1,17 @@
+package com.zt.plat.module.contractorder.enums.salesorder;
+
+import com.zt.plat.framework.common.exception.ErrorCode;
+
+/**
+ * contract-order 错误码枚举类
+ *
+ * contract-order 系统，使用 1-xxx-xxx-xxx 段
+ *
+ * @author ZT
+ */
+public interface ErrorCodeConstants {
+
+    // ========== 合同模块 1-027-000-000 ==========
+    ErrorCode SALES_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_008_00_600, "消费订单不存在");
+
+}

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

@@ -145,8 +145,8 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
-    public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
-        return success(contractService.submitErp(ids));
+    public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) {
+        return success(contractService.submitErp(id));
     }
 
     @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/DownOrUpOrderReqVO.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+@Data
+@Schema(description = "上下级订单 请求 VO")
+@Validated
+public class DownOrUpOrderReqVO {
+    @Schema(description = "订单id")
+    private Long orderId;
+    @Schema(description = "订单类型")
+    @NotEmpty(message = "订单类型不能为空(上游  up ,下游 down)")
+    private String orderType;
+    @Schema(description = "订单号")
+    private String orderNo;
+}

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

@@ -0,0 +1,41 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "上下游订单 响应 VO")
+public class DownOrUpOrderRespVO {
+    /**
+     * 订单编号
+     */
+    @Schema(description = "订单编号")
+    private String orderNo;
+    /**
+     * 订单ID
+     */
+    @Schema(description = "订单ID")
+    private String orderId;
+    /**
+     * 订单类型
+     */
+    @Schema(description = "订单类型")
+    private String orderType;
+    /**
+     * 合同名称
+     */
+    @Schema(description = "合同名称")
+    private String contractName;
+    /**
+     * 合同id
+     */
+    @Schema(description = "合同id")
+    private String contractId;
+    /**
+     * 合同号
+     */
+    @Schema(description = "合同号")
+    private String contractNumber;
+
+
+}

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

@@ -156,4 +156,6 @@ public class PrchOrdDtlPageReqVO extends PageParam {
     @Schema(description = "金属元素编码")
     private String elemCdg;
 
+    @Schema(description = "订单类型")
+    private String  splyBsnTp;
 }

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

@@ -163,5 +163,7 @@ public class PrchOrdDtlSaveReqVO {
 
     @Schema(description = "金属元素编码")
     private String elemCdg;
+    @Schema(description = "税点")
+    private String taxRte;
 
 }