Merge branch 'refs/heads/dev' into test

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;
 
 }

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

@@ -0,0 +1,90 @@
+package com.zt.plat.module.contractorder.controller.admin.salesorder.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 销售订单明细分页 Request VO")
+@Data
+public class SalesOrderDetailPageReqVO extends PageParam {
+
+    @Schema(description = "订单主键", example = "9072")
+    private Long orderId;
+
+    @Schema(description = "行项目;推送ERP(必须)")
+    private Long lineNumber;
+
+    @Schema(description = "物料名称", example = "芋艿")
+    private String materialName;
+
+    @Schema(description = "物料编码;推送ERP(必须)")
+    private String materialNumber;
+
+    @Schema(description = "工厂名称", example = "芋艿")
+    private String factoryName;
+
+    @Schema(description = "工厂编码;推送ERP(必须)")
+    private String factoryNumber;
+
+    @Schema(description = "库位名称", example = "赵六")
+    private String warehouseName;
+
+    @Schema(description = "库位编码;推送ERP(必须)")
+    private String warehouseNumber;
+
+    @Schema(description = "计量单位;推送ERP(必须)")
+    private String unit;
+
+    @Schema(description = "开票类型;推送ERP(必须)", example = "2")
+    private String invoiceType;
+
+    @Schema(description = "暂估数量;推送ERP(必须)")
+    private BigDecimal quantity;
+
+    @Schema(description = "稅分类(字典:SALE_TAX);推送ERP(必须)")
+    private String taxAcctasscat;
+
+    @Schema(description = "项目类别;推送ERP")
+    private String projectCategory;
+
+    @Schema(description = "装运地点;推送ERP")
+    private String shippingPlace;
+
+    @Schema(description = "物料科目分配组;推送ERP（必须）")
+    private String metalAcctasscatGroup;
+
+    @Schema(description = "小协议号")
+    private String agreementNumber;
+
+    @Schema(description = "总价")
+    private BigDecimal gross;
+
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
+    @Schema(description = "金属元素名称", example = "张三")
+    private String elementName;
+
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
+
+    @Schema(description = "是否启用;处理明细中多个相同物料，只能允许一种物料启用")
+    private String isEnable;
+
+    @Schema(description = "价格条件详情;推送ERP(必须):JSON")
+    private String priceConditionDetail;
+
+    @Schema(description = "来料加工原料详情;推送ERP:订单类型(JSON)")
+    private String originDetail;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}