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

zt-module-contract-order/zt-module-contract-order-api/pom.xml

@@ -41,6 +41,12 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-base-server</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -4,9 +4,11 @@ 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.contract.ContractRespDTO;
+import com.zt.plat.module.contractorder.api.vo.contract.ContractSaveReqVO;
 import com.zt.plat.module.contractorder.enums.ApiConstants;
 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.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,4 +33,8 @@ public interface ContractApi {
     @PostMapping(PREFIX + "/order-by-order-no")
     @Operation(summary = "更新订单状态", description = "通过订单编号获取订单信息")
     CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS);
+
+    @PostMapping(PREFIX + "/create")
+    @Operation(summary = "创建合同")
+    CommonResult<Boolean> create(@Valid @RequestBody ContractSaveReqVO reqVO);
 }

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

@@ -1,6 +1,5 @@
 package com.zt.plat.module.contractorder.api.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,6 +1,6 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
+
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceItemRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -12,7 +12,6 @@ import java.util.List;
 
 @Schema(description = "管理后台 - 合同详情 Response VO")
 @Data
-@ExcelIgnoreUnannotated
 public class ContractRespVO {
 
     @Schema(description = "主键")

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

@@ -1,7 +1,6 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import cn.hutool.json.JSONArray;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -17,7 +16,6 @@ import java.util.List;
 public class ContractSaveReqVO {
 
     @Schema(description = "主键，新增时为空，修改时需要有值")
-    @ExcelProperty("主键")
     private Long id;
 
     @NotNull(message = "步骤不能为空")

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,6 +1,5 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,7 +8,6 @@ import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 参数降级规则 Response VO")
 @Data
-@ExcelIgnoreUnannotated
 public class DemoteRespVO {
 
     @Schema(description = "主键")

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import cn.hutool.json.JSONArray;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,6 +1,5 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,7 +8,6 @@ import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 品位不计价规则 Response VO")
 @Data
-@ExcelIgnoreUnannotated
 public class NotRespVO {
 
     @Schema(description = "主键")

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -4,16 +4,21 @@ import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.contractorder.api.dto.PrchOrdDtlDTO;
 import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderDetailsRespVO;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderWithDetailsVO;
 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.controller.admin.purchaseorder.vo.PurchaseOrderDetailsRespVO;
 import com.zt.plat.module.contractorder.service.contract.ContractService;
 import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService;
 import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,6 +33,8 @@ public class ContractApiImpl implements ContractApi {
     private ContractService contractService;
     @Resource
     private PurchaseOrderService purchaseOrderService;
+    @Resource
+    private RedisTemplate redisTemplate;
 
     @Override
     public ContractRespDTO getContractByPaperNumber(String contractPaperNumber) {
@@ -57,4 +64,17 @@ public class ContractApiImpl implements ContractApi {
         });
         return success(purchaseOrderWithDetailsDTOS);
     }
+
+    @Override
+    public CommonResult<Boolean> create(@Valid @RequestBody ContractSaveReqVO reqVO) {
+        log.info("外部调用创建合同接口，参数：{}", reqVO);
+        redisTemplate.opsForHash().put(
+                "HT-TEMP",
+                reqVO.getContractPaperNumber()
+                        + "-"
+                        + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmSSS")),
+                reqVO)
+        ;
+        return success(true);
+    }
 }

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

@@ -5,7 +5,7 @@ import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
+import com.zt.plat.module.contractorder.api.vo.contract.*;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import com.zt.plat.module.contractorder.service.contract.ContractService;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -1,9 +1,7 @@
 package com.zt.plat.module.contractorder.controller.admin.purchaseorder;
 
 import com.zt.plat.module.contractorder.api.ContractApiImpl;
-import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
-import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderSaveReqVO;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,6 +1,5 @@
 package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
 
-import com.zt.plat.module.contractorder.api.dto.PrchOrdDtlDTO;
 import lombok.Data;
 
 import java.math.BigDecimal;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java

@@ -1,7 +1,7 @@
 package com.zt.plat.module.contractorder.dal.mysql.contract;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.DemoteRespVO;
+import com.zt.plat.module.contractorder.api.vo.contract.DemoteRespVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractDemoteDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java

@@ -1,7 +1,7 @@
 package com.zt.plat.module.contractorder.dal.mysql.contract;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.FormulaRespVO;
+import com.zt.plat.module.contractorder.api.vo.contract.FormulaRespVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractFormulaDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java

@@ -3,7 +3,7 @@ package com.zt.plat.module.contractorder.dal.mysql.contract;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractPageReqVO;
+import com.zt.plat.module.contractorder.api.vo.contract.ContractPageReqVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import org.apache.ibatis.annotations.Mapper;
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java

@@ -1,7 +1,7 @@
 package com.zt.plat.module.contractorder.dal.mysql.contract;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.NotRespVO;
+import com.zt.plat.module.contractorder.api.vo.contract.NotRespVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractNotDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

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

@@ -3,8 +3,7 @@ package com.zt.plat.module.contractorder.service.contract;
 import cn.hutool.json.JSONObject;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
+import com.zt.plat.module.contractorder.api.vo.contract.*;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.LinkOrderReqVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import jakarta.validation.Valid;
 import org.springframework.core.io.ByteArrayResource;

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

@@ -23,7 +23,7 @@ import com.zt.plat.module.bpm.api.task.BpmTaskApi;
 import com.zt.plat.module.bpm.api.task.dto.*;
 import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
 import com.zt.plat.module.contractorder.api.dto.contract.*;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
+import com.zt.plat.module.contractorder.api.vo.contract.*;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.*;
 import com.zt.plat.module.contractorder.dal.mysql.contract.*;
 import com.zt.plat.module.contractorder.enums.*;

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

@@ -11,9 +11,8 @@ import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi;
 import com.zt.plat.module.bpm.api.task.BpmTaskApi;
 import com.zt.plat.module.bpm.api.task.dto.*;
 import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
-import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractRespVO;
+import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
-import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderSaveReqVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
@@ -41,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;