1、修改bug

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java

@@ -260,7 +260,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
             code = TmplStsEnum.STOPPED.getCode();
         } else if (reqVO.getType().equals("enable")) {
             // 启用
-            code = TmplStsEnum.START.getCode();
+            code = TmplStsEnum.DRAFT.getCode();
         }
         if (code.isEmpty()) {
             throw exception(ILLEGAL_OPERATION_TYPE);

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

@@ -2,7 +2,7 @@ package com.zt.plat.module.contractorder.api;
 
 
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
+import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 import com.zt.plat.module.contractorder.api.vo.contract.ContractSaveReqVO;
 import com.zt.plat.module.contractorder.api.vo.contract.international.ContractRequest;
@@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.api.dto;
+package com.zt.plat.module.contractorder.api.dto.order;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.api.dto;
+package com.zt.plat.module.contractorder.api.dto.order;
 
 import lombok.Data;
 
@@ -189,5 +189,12 @@ public class PurchaseOrderWithDetailsDTO {
      *  订单类型
      */
     private String splyBsnTp;
-    private List<PrchOrdDtlDTO> orderDetails;
+    /**
+     * 采购订单明细
+     */
+    private List<PrchOrdDtlDTO> prchOrdDtlDTOS;
+    /**
+     * 消费订单明细
+     */
+    private List<SalesOrdDtlDTO> salesOrdDtlDTOS;
 }

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

@@ -77,7 +77,7 @@ public class PrchOrdDtlDetailsRespVO {
      * 税码(字典: 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/salesorder/SalesOrderController.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.controller.admin.salesorder;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
@@ -8,7 +9,9 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.contractorder.api.ContractApi;
 import com.zt.plat.module.contractorder.api.ContractApiImpl;
+import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
 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;
@@ -26,12 +29,14 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import org.redisson.api.RObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
@@ -85,10 +90,10 @@ public class SalesOrderController implements BusinessControllerMarker {
     @Operation(summary = "获得销售订单")
     @Parameter(name = "id", description = "id是订单主键，splyBsnTp是订单类型销售或者是消费", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('base:sales-order:query')")
-    public CommonResult<SalesOrderRespVO> getSalesOrder(@RequestParam("id") Long id,@RequestParam(value = "splyBsnTp",required = false) String splyBsnTp) {
+    public CommonResult<SalesOrderRespVO> getSalesOrder(@RequestParam("id") Long id, @RequestParam(value = "splyBsnTp", required = false) String splyBsnTp) {
         SalesOrderDO purchaseOrder = salesOrderService.getSalesOrder(id, splyBsnTp);
         SalesOrderRespVO salesOrderRespVO = BeanUtils.toBean(purchaseOrder, SalesOrderRespVO.class);
-        if (salesOrderRespVO == null){
+        if (salesOrderRespVO == null) {
             return success(null);
         }
         salesOrderService.setSalesOrderDetail(salesOrderRespVO);
@@ -101,7 +106,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     public CommonResult<PageResult<SalesOrderRespVO>> getSalesOrderPage(@Valid SalesOrderPageReqVO pageReqVO) {
         PageResult<SalesOrderDO> pageResult = salesOrderService.getSalesOrderPage(pageReqVO);
         PageResult<SalesOrderRespVO> salesOrderRespVOPageResult = BeanUtils.toBean(pageResult, SalesOrderRespVO.class);
-        if (salesOrderRespVOPageResult.getList() != null){
+        if (salesOrderRespVOPageResult.getList() != null) {
             salesOrderRespVOPageResult.getList().forEach(purchaseOrderRespVO -> salesOrderService.setSalesOrderDetail(purchaseOrderRespVO));
         }
 
@@ -124,14 +129,14 @@ public class SalesOrderController implements BusinessControllerMarker {
     //推送erp091
     @PostMapping("/push-erp091")
     @Operation(summary = "推送erp091")
-    public CommonResult<Boolean> pushErp091(@RequestParam("id")String id ) {
+    public CommonResult<Boolean> pushErp091(@RequestParam("id") String id) {
         return success(salesOrderService.pushErp091(id));
     }
 
     //提交审批
     @PostMapping("/submit-order")
     @Operation(summary = "提交审批")
-    public CommonResult<String> submitOrder(@RequestParam("id")String id ) {
+    public CommonResult<String> submitOrder(@RequestParam("id") String id) {
         return success(salesOrderService.submitOrder(id));
     }
 
@@ -141,6 +146,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     public CommonResult<Boolean> orderPassReject(@RequestBody SalesOrderReviewReqVO reqVO) {
         return success(salesOrderService.orderPassReject(reqVO));
     }
+
     //关联订单
     @PostMapping("/link-order")
     @Operation(summary = "关联订单")
@@ -152,7 +158,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     @PostMapping("/order-by-order-id-and-type")
     @Operation(summary = "根据订单id和方式获取上或下游订单")
     public CommonResult<List<DownOrUpOrderRespVO>> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) {
-        return success( salesOrderService.getOrderByOrderIdAndType(reqVO));
+        return success(salesOrderService.getOrderByOrderIdAndType(reqVO));
     }
 
 
@@ -168,5 +174,4 @@ public class SalesOrderController implements BusinessControllerMarker {
         salesOrderService.updateOrderStatusByIdOrOrderNo(req);
         return success(true);
     }
-
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java

@@ -124,6 +124,25 @@ public interface PurchaseOrderService {
      * @return 结果
      */
     Boolean linkOrder(@Valid  LinkOrderReqVO LinkOrderReqVO);
-
+    /**
+     * 获取订单详情
+     *
+     * @param ids 订单id
+     * @return 订单详情
+     */
     List<PurchaseOrderDetailsRespVO>  getOrderByIds(List<Long> ids);
+    /**
+     * 获取订单详情
+     *
+     * @param orderNos 订单编号
+     * @return 订单详情
+     */
+    List<PurchaseOrderDO> getOrderByNos(List<String> orderNos);
+    /**
+     * 获取订单详情
+     *
+     * @param ids 订单id
+     * @return 订单详情
+     */
+    List<PurchaseOrderDO> getOrdersByIds(List<String> ids);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java

@@ -677,4 +677,14 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         });
         return purchaseOrderDetailsRespVOS;
     }
+
+    @Override
+    public List<PurchaseOrderDO> getOrderByNos(List<String> orderNos) {
+        return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber, orderNos);
+    }
+
+    @Override
+    public List<PurchaseOrderDO> getOrdersByIds(List<String> ids) {
+        return purchaseOrderMapper.selectByIds(ids);
+    }
 }