解决依赖循环问题

hx-mes/pom.xml

@@ -31,10 +31,12 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-item</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-wms</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-sale</artifactId>

hx-purchase/pom.xml

@@ -43,6 +43,7 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-account</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>hx-kd100</artifactId>
@@ -50,10 +51,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-sale</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

hx-sale/pom.xml

@@ -38,11 +38,6 @@
             <artifactId>hx-purchase</artifactId>
         </dependency>
 
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mes</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

hx-purchase/src/main/java/com/fjhx/purchase/flow/PurchaseFlow.java → hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -1,10 +1,9 @@
-package com.fjhx.purchase.flow;
+package com.fjhx.sale.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
@@ -17,11 +16,8 @@ import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.util.code.CodeEnum;
-import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
-import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.contract.ContractService;
 import com.obs.services.internal.ServiceException;
 import org.springframework.stereotype.Component;
 
@@ -44,7 +40,6 @@ public class PurchaseFlow extends FlowDelegate {
         return "purchase_flow";
     }
 
-
     /**
      * 发起流程
      * @param flowId 流程ID
@@ -112,6 +107,6 @@ public class PurchaseFlow extends FlowDelegate {
         detail.setStatus(PurchaseDetailStatusEnum.PASS.getKey());
         purchaseDetailService.update(detail,Wrappers.<PurchaseDetail>query()
                 .lambda().eq(PurchaseDetail::getPurchaseId,purchase.getId()));
-
     }
+    
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/sales/SalesRecordService.java

@@ -1,10 +1,10 @@
 package com.fjhx.victoriatourist.service.sales;
 
-import com.fjhx.victoriatourist.entity.sales.po.SalesRecord;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.victoriatourist.entity.sales.vo.SalesRecordVo;
 import com.fjhx.victoriatourist.entity.sales.dto.SalesRecordSelectDto;
+import com.fjhx.victoriatourist.entity.sales.po.SalesRecord;
+import com.fjhx.victoriatourist.entity.sales.vo.SalesRecordVo;
+import com.ruoyi.common.core.service.BaseService;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -13,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
  * 销售数据 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 public interface SalesRecordService extends BaseService<SalesRecord> {
@@ -23,7 +23,9 @@ public interface SalesRecordService extends BaseService<SalesRecord> {
      */
     Page<SalesRecordVo> getPage(SalesRecordSelectDto dto);
 
-
+    /**
+     * 导入excel数据
+     */
     void excelImport(MultipartFile file, Long warehouseId);
 
 }