1、订单管理相关 2、销售订单相关接口

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PrchOrdDtlDTO.java

@@ -77,7 +77,7 @@ public class PrchOrdDtlDTO {
      * 税码(字典: PRCH_TAX);推送ERP
      */
 
-    private BigDecimal taxNum;
+    private String taxNum;
     /**
      * 是否基于GR的发票校验;推送ERP
      */

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

@@ -1,5 +1,7 @@
 package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
 
+import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SaleOrderDetailsRespVO;
+import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -41,7 +43,7 @@ public class DownOrUpOrderRespVO {
      * 订单
      */
     @Schema(description = "订单")
-    private PurchaseOrderRespVO order;
+    private Object order;
 
 
 }

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

@@ -49,7 +49,7 @@ public class SalesOrderController implements BusinessControllerMarker {
 
 
     @PostMapping("/create")
-    @Operation(summary = "创建采购订单")
+    @Operation(summary = "创建销售订单")
     @PreAuthorize("@ss.hasPermission('base:sales-order:create')")
     public CommonResult<SalesOrderRespVO> createSalesOrder(@Valid @RequestBody SalesOrderSaveReqVO createReqVO) {
         return success(salesOrderService.createSalesOrder(createReqVO));
@@ -141,6 +141,25 @@ public class SalesOrderController implements BusinessControllerMarker {
     public CommonResult<Boolean> orderPassReject(@RequestBody SalesOrderReviewReqVO reqVO) {
         return success(salesOrderService.orderPassReject(reqVO));
     }
+    //关联订单
+    @PostMapping("/link-order")
+    @Operation(summary = "关联订单")
+    public CommonResult<Boolean> linkOrder(@RequestBody @Validated LinkOrderReqVO req) {
+        return success(salesOrderService.linkOrder(req));
+    }
 
+    //根据订单id和方式获取上或下游订单
+    @PostMapping("/order-by-order-id-and-type")
+    @Operation(summary = "根据订单id和方式获取上或下游订单")
+    public CommonResult<List<DownOrUpOrderRespVO>> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) {
+        return success( salesOrderService.getOrderByOrderIdAndType(reqVO));
+    }
+
+
+    @PostMapping("/bound-order")
+    @Operation(summary = "获取已绑定的订单")
+    public CommonResult<List<PurchaseOrderRespVO>> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) {
+        return success(salesOrderService.getBindOrderByOrder(reqVO));
+    }
 
 }

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

@@ -2,7 +2,7 @@ package com.zt.plat.module.contractorder.service.salesorder;
 
 import java.util.*;
 
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseorderReqVO;
+import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
 import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderPageReqVO;
 import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderRespVO;
 import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderReviewReqVO;
@@ -91,4 +91,27 @@ public interface SalesOrderService {
      *
      */
     boolean orderPassReject(SalesOrderReviewReqVO salesOrderReviewReqVO);
+    /**
+     * 消费订单关联采购订单
+     *
+     * @param reqVO 采购订单
+     *
+     */
+    boolean  linkOrder(LinkOrderReqVO reqVO);
+    /**
+     * 获取消费订单详情
+     *
+     * @param reqVO 采购订单
+     *
+     */
+
+    List<DownOrUpOrderRespVO> getOrderByOrderIdAndType(DownOrUpOrderReqVO reqVO);
+    /**
+     * 获取已绑定消费订单详情
+     *
+     * @param reqVO 采购订单
+     *
+     */
+
+    List<PurchaseOrderRespVO> getBindOrderByOrder(DownOrUpOrderReqVO reqVO);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/util/constants/ProcessDefinitionKeyConstants.java

@@ -3,4 +3,5 @@ package com.zt.plat.module.contractorder.util.constants;
 public interface ProcessDefinitionKeyConstants {
 
     String PURCHASE_ORDER_REVIEW_PROCESS = "purchase_order_review";
+    String SALES_ORDER_REVIEW_PROCESS = "sales_order_review";
 }