样品单

hx-ehsd/src/main/java/com/fjhx/sale/enums/FlowStatusEnum.java → hx-common/src/main/java/com/fjhx/common/enums/FlowStatusEnum.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.enums;
+package com.fjhx.common.enums;
 
 import org.apache.commons.collections4.MapUtils;
 

hx-ehsd/src/main/java/com/fjhx/sale/controller/sample/SampleController.java → hx-ehsd/src/main/java/com/fjhx/ehsd/controller/sample/SampleController.java

@@ -1,14 +1,12 @@
-package com.fjhx.sale.controller.sample;
+package com.fjhx.ehsd.controller.sample;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleVo;
-import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleDto;
+import com.fjhx.ehsd.entity.sample.vo.SampleVo;
+import com.fjhx.ehsd.entity.sample.dto.SampleSelectDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.sale.service.sample.SampleService;
+import com.fjhx.ehsd.service.sample.SampleService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 

hx-ehsd/src/main/java/com/fjhx/sale/controller/sample/SampleProductController.java → hx-ehsd/src/main/java/com/fjhx/ehsd/controller/sample/SampleProductController.java

@@ -1,14 +1,12 @@
-package com.fjhx.sale.controller.sample;
+package com.fjhx.ehsd.controller.sample;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.ehsd.entity.sample.dto.SampleProductDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleProductSelectDto;
+import com.fjhx.ehsd.entity.sample.vo.SampleProductVo;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProductVo;
-import com.fjhx.sale.entity.sample.dto.SampleProductSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleProductDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.sale.service.sample.SampleProductService;
+import com.fjhx.ehsd.service.sample.SampleProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 

hx-ehsd/src/main/java/com/fjhx/sale/controller/sample/SampleProjectController.java → hx-ehsd/src/main/java/com/fjhx/ehsd/controller/sample/SampleProjectController.java

@@ -1,14 +1,12 @@
-package com.fjhx.sale.controller.sample;
+package com.fjhx.ehsd.controller.sample;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.ehsd.entity.sample.dto.SampleProjectDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleProjectSelectDto;
+import com.fjhx.ehsd.entity.sample.vo.SampleProjectVo;
+import com.fjhx.ehsd.service.sample.SampleProjectService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
-import com.fjhx.sale.entity.sample.dto.SampleProjectSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleProjectDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.sale.service.sample.SampleProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 

hx-ehsd/src/main/java/com/fjhx/sale/controller/sample/SampleShipmentController.java → hx-ehsd/src/main/java/com/fjhx/ehsd/controller/sample/SampleShipmentController.java

@@ -1,14 +1,12 @@
-package com.fjhx.sale.controller.sample;
+package com.fjhx.ehsd.controller.sample;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.ehsd.entity.sample.dto.SampleShipmentDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleShipmentSelectDto;
+import com.fjhx.ehsd.entity.sample.vo.SampleShipmentVo;
+import com.fjhx.ehsd.service.sample.SampleShipmentService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
-import com.fjhx.sale.entity.sample.dto.SampleShipmentSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleShipmentDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.sale.service.sample.SampleShipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
-import com.fjhx.sale.entity.sample.po.Sample;
+import com.fjhx.ehsd.entity.sample.po.Sample;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleProductDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleProductDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
-import com.fjhx.sale.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.po.SampleProduct;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleProductSelectDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleProductSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleProjectDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleProjectDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
-import com.fjhx.sale.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.po.SampleProject;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleProjectSelectDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleProjectSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleSelectDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
@@ -14,4 +14,8 @@ import lombok.Setter;
 @Setter
 public class SampleSelectDto extends BaseSelectDto {
 
+    /**
+     * 审批状态
+     */
+    private String status;
 }

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleShipmentDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleShipmentDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
-import com.fjhx.sale.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.po.SampleShipment;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/dto/SampleShipmentSelectDto.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/dto/SampleShipmentSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.sample.dto;
+package com.fjhx.ehsd.entity.sample.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/po/Sample.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/Sample.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.sample.po;
+package com.fjhx.ehsd.entity.sample.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/po/SampleProduct.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/SampleProduct.java

@@ -1,11 +1,10 @@
-package com.fjhx.sale.entity.sample.po;
+package com.fjhx.ehsd.entity.sample.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 import lombok.Getter;

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/po/SampleProject.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/SampleProject.java

@@ -1,9 +1,9 @@
-package com.fjhx.sale.entity.sample.po;
+package com.fjhx.ehsd.entity.sample.po;
 
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/po/SampleShipment.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/SampleShipment.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.sample.po;
+package com.fjhx.ehsd.entity.sample.po;
 
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/vo/SampleProductVo.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/vo/SampleProductVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.vo;
+package com.fjhx.ehsd.entity.sample.vo;
 
-import com.fjhx.sale.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.po.SampleProduct;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/vo/SampleProjectVo.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/vo/SampleProjectVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.vo;
+package com.fjhx.ehsd.entity.sample.vo;
 
-import com.fjhx.sale.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.po.SampleProject;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/vo/SampleShipmentVo.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/vo/SampleShipmentVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.vo;
+package com.fjhx.ehsd.entity.sample.vo;
 
-import com.fjhx.sale.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.po.SampleShipment;
 import lombok.Getter;
 import lombok.Setter;
 

hx-ehsd/src/main/java/com/fjhx/sale/entity/sample/vo/SampleVo.java → hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/vo/SampleVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.sample.vo;
+package com.fjhx.ehsd.entity.sample.vo;
 
-import com.fjhx.sale.entity.sample.po.Sample;
+import com.fjhx.ehsd.entity.sample.po.Sample;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,4 +14,8 @@ import lombok.Setter;
 @Setter
 public class SampleVo extends Sample {
 
+    /**
+     * 买方名称
+     */
+    private String buyCorporationName;
 }

hx-ehsd/src/main/java/com/fjhx/sale/flow/SampleFlow.java → hx-ehsd/src/main/java/com/fjhx/ehsd/flow/SampleFlow.java

@@ -1,25 +1,23 @@
-package com.fjhx.sale.flow;
+package com.fjhx.ehsd.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.ehsd.entity.sample.po.Sample;
+import com.fjhx.ehsd.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.service.sample.SampleProductService;
+import com.fjhx.ehsd.service.sample.SampleProjectService;
+import com.fjhx.ehsd.service.sample.SampleService;
+import com.fjhx.ehsd.service.sample.SampleShipmentService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.sale.entity.sample.po.Sample;
-import com.fjhx.sale.entity.sample.po.SampleProduct;
-import com.fjhx.sale.entity.sample.po.SampleProject;
-import com.fjhx.sale.entity.sample.po.SampleShipment;
-import com.fjhx.sale.enums.FlowStatusEnum;
-import com.fjhx.sale.service.sample.SampleProductService;
-import com.fjhx.sale.service.sample.SampleProjectService;
-import com.fjhx.sale.service.sample.SampleService;
-import com.fjhx.sale.service.sample.SampleShipmentService;
-import com.fjhx.sale.util.code.CodeEnum;
+import com.fjhx.ehsd.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
 import org.springframework.stereotype.Component;
 
@@ -56,7 +54,7 @@ public class SampleFlow extends FlowDelegate {
         SampleProjectService sampleProjectService = SpringUtil.getBean(SampleProjectService.class);
         SampleShipmentService sampleShipmentService = SpringUtil.getBean(SampleShipmentService.class);
         Sample sample = submitData.toJavaObject(Sample.class);
-        sample.setCode(CodeEnum.SAMPLE.getCode());
+        sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
         sample.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
         sampleService.save(sample);
         List<SampleProduct> sampleProductList = sample.getSampleProductList();
@@ -95,12 +93,12 @@ public class SampleFlow extends FlowDelegate {
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         SampleService sampleService = SpringUtil.getBean(SampleService.class);
-        //通过业务ID查询合同数据
+        //通过业务ID查询样品单数据
         Sample sample = sampleService.getById(businessId);
         if(ObjectUtils.isEmpty(sample)){
             throw new ServiceException("样品单不存在");
         }
-        //修改采购状态为审批通过
+        //修改样品单状态为审批通过
         sample.setStatus(FlowStatusEnum.PASS.getKey());
         sample.setApprovedDate(new Date());
         sampleService.updateById(sample);

hx-ehsd/src/main/java/com/fjhx/sale/mapper/sample/SampleMapper.java → hx-ehsd/src/main/java/com/fjhx/ehsd/mapper/sample/SampleMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.sale.mapper.sample;
+package com.fjhx.ehsd.mapper.sample;
 
-import com.fjhx.sale.entity.sample.po.Sample;
+import com.fjhx.ehsd.entity.sample.po.Sample;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleVo;
+import com.fjhx.ehsd.entity.sample.vo.SampleVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-ehsd/src/main/java/com/fjhx/sale/mapper/sample/SampleProductMapper.java → hx-ehsd/src/main/java/com/fjhx/ehsd/mapper/sample/SampleProductMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.sale.mapper.sample;
+package com.fjhx.ehsd.mapper.sample;
 
-import com.fjhx.sale.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.vo.SampleProductVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProductVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-ehsd/src/main/java/com/fjhx/sale/mapper/sample/SampleProjectMapper.java → hx-ehsd/src/main/java/com/fjhx/ehsd/mapper/sample/SampleProjectMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.sale.mapper.sample;
+package com.fjhx.ehsd.mapper.sample;
 
-import com.fjhx.sale.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.vo.SampleProjectVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-ehsd/src/main/java/com/fjhx/sale/mapper/sample/SampleShipmentMapper.java → hx-ehsd/src/main/java/com/fjhx/ehsd/mapper/sample/SampleShipmentMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.sale.mapper.sample;
+package com.fjhx.ehsd.mapper.sample;
 
-import com.fjhx.sale.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.vo.SampleShipmentVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/SampleProductService.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/SampleProductService.java

@@ -1,11 +1,11 @@
-package com.fjhx.sale.service.sample;
+package com.fjhx.ehsd.service.sample;
 
-import com.fjhx.sale.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.dto.SampleProductDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleProductSelectDto;
+import com.fjhx.ehsd.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.vo.SampleProductVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProductVo;
-import com.fjhx.sale.entity.sample.dto.SampleProductSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleProductDto;
 
 
 /**

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/SampleProjectService.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/SampleProjectService.java

@@ -1,11 +1,11 @@
-package com.fjhx.sale.service.sample;
+package com.fjhx.ehsd.service.sample;
 
-import com.fjhx.sale.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.dto.SampleProjectDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleProjectSelectDto;
+import com.fjhx.ehsd.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.vo.SampleProjectVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
-import com.fjhx.sale.entity.sample.dto.SampleProjectSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleProjectDto;
 
 
 /**

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/SampleService.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/SampleService.java

@@ -1,11 +1,11 @@
-package com.fjhx.sale.service.sample;
+package com.fjhx.ehsd.service.sample;
 
-import com.fjhx.sale.entity.sample.po.Sample;
+import com.fjhx.ehsd.entity.sample.po.Sample;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleVo;
-import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleDto;
+import com.fjhx.ehsd.entity.sample.vo.SampleVo;
+import com.fjhx.ehsd.entity.sample.dto.SampleSelectDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleDto;
 
 
 /**

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/SampleShipmentService.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/SampleShipmentService.java

@@ -1,11 +1,11 @@
-package com.fjhx.sale.service.sample;
+package com.fjhx.ehsd.service.sample;
 
-import com.fjhx.sale.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.dto.SampleShipmentDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleShipmentSelectDto;
+import com.fjhx.ehsd.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.vo.SampleShipmentVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
-import com.fjhx.sale.entity.sample.dto.SampleShipmentSelectDto;
-import com.fjhx.sale.entity.sample.dto.SampleShipmentDto;
 
 
 /**

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/impl/SampleProductServiceImpl.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/impl/SampleProductServiceImpl.java

@@ -1,21 +1,21 @@
-package com.fjhx.sale.service.sample.impl;
+package com.fjhx.ehsd.service.sample.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.fjhx.ehsd.entity.sample.dto.SampleProductDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleProductSelectDto;
+import com.fjhx.ehsd.entity.sample.po.SampleProduct;
+import com.fjhx.ehsd.entity.sample.vo.SampleProductVo;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.sale.entity.sample.po.SampleProduct;
-import com.fjhx.sale.mapper.sample.SampleProductMapper;
-import com.fjhx.sale.service.sample.SampleProductService;
+import com.fjhx.ehsd.mapper.sample.SampleProductMapper;
+import com.fjhx.ehsd.service.sample.SampleProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProductVo;
-import com.fjhx.sale.entity.sample.dto.SampleProductSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.sample.dto.SampleProductDto;
 import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/impl/SampleProjectServiceImpl.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/impl/SampleProjectServiceImpl.java

@@ -1,15 +1,15 @@
-package com.fjhx.sale.service.sample.impl;
-
-import com.fjhx.sale.entity.sample.po.SampleProject;
-import com.fjhx.sale.mapper.sample.SampleProjectMapper;
-import com.fjhx.sale.service.sample.SampleProjectService;
+package com.fjhx.ehsd.service.sample.impl;
+
+import com.fjhx.ehsd.entity.sample.dto.SampleProjectDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleProjectSelectDto;
+import com.fjhx.ehsd.entity.sample.po.SampleProject;
+import com.fjhx.ehsd.entity.sample.vo.SampleProjectVo;
+import com.fjhx.ehsd.mapper.sample.SampleProjectMapper;
+import com.fjhx.ehsd.service.sample.SampleProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
-import com.fjhx.sale.entity.sample.dto.SampleProjectSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.sample.dto.SampleProjectDto;
 import cn.hutool.core.bean.BeanUtil;
 
 

hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/impl/SampleServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fjhx.ehsd.service.sample.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.customer.entity.customer.po.Customer;
+import com.fjhx.customer.service.customer.CustomerService;
+import com.fjhx.ehsd.entity.sample.po.Sample;
+import com.fjhx.ehsd.mapper.sample.SampleMapper;
+import com.fjhx.ehsd.service.sample.SampleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.ehsd.entity.sample.vo.SampleVo;
+import com.fjhx.ehsd.entity.sample.dto.SampleSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.ehsd.entity.sample.dto.SampleDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 样品单表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-05
+ */
+@Service
+public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> implements SampleService {
+
+
+    @Autowired
+    private CustomerService customerService;
+
+    /**
+     * 分页
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<SampleVo> getPage(SampleSelectDto dto) {
+        IWrapper<Sample> wrapper = getWrapper();
+        wrapper.orderByDesc("s", Sample::getCreateTime);
+        if(StringUtils.isNotEmpty(dto.getStatus())){
+            wrapper.eq("s",Sample::getStatus,dto.getStatus());
+        }
+        if(StringUtils.isNotEmpty(dto.getKeyword())){
+            wrapper.keyword(dto.getKeyword(),new SqlField("s",Sample::getCode));
+        }
+        Page<SampleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<SampleVo> list = page.getRecords();
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Long> customerIds = list.stream().map(Sample::getBuyCorporationId).collect(Collectors.toList());
+            List<Customer> customerList = customerService.list(Wrappers.<Customer>query().lambda().in(Customer::getId,customerIds));
+            Map<Long,List<Customer>> cusMap = customerList.stream().distinct().collect(Collectors.groupingBy(Customer::getId));
+            if(MapUtils.isNotEmpty(cusMap)){//客户
+                for(SampleVo p:list){
+                    List<Customer> customers = cusMap.getOrDefault(p.getBuyCorporationId(),null);
+                    p.setBuyCorporationName(customers==null?null:customers.get(0).getName());
+                }
+            }
+        }
+        return page;
+    }
+
+    @Override
+    public SampleVo detail(Long id) {
+        Sample Sample = this.getById(id);
+        SampleVo result = BeanUtil.toBean(Sample, SampleVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(SampleDto sampleDto) {
+        this.save(sampleDto);
+    }
+
+    @Override
+    public void edit(SampleDto sampleDto) {
+        this.updateById(sampleDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/impl/SampleShipmentServiceImpl.java → hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/impl/SampleShipmentServiceImpl.java

@@ -1,15 +1,15 @@
-package com.fjhx.sale.service.sample.impl;
-
-import com.fjhx.sale.entity.sample.po.SampleShipment;
-import com.fjhx.sale.mapper.sample.SampleShipmentMapper;
-import com.fjhx.sale.service.sample.SampleShipmentService;
+package com.fjhx.ehsd.service.sample.impl;
+
+import com.fjhx.ehsd.entity.sample.dto.SampleShipmentDto;
+import com.fjhx.ehsd.entity.sample.dto.SampleShipmentSelectDto;
+import com.fjhx.ehsd.entity.sample.po.SampleShipment;
+import com.fjhx.ehsd.entity.sample.vo.SampleShipmentVo;
+import com.fjhx.ehsd.mapper.sample.SampleShipmentMapper;
+import com.fjhx.ehsd.service.sample.SampleShipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
-import com.fjhx.sale.entity.sample.dto.SampleShipmentSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.sample.dto.SampleShipmentDto;
 import cn.hutool.core.bean.BeanUtil;
 
 

hx-ehsd/src/main/java/com/fjhx/sale/util/code/CodeEnum.java → hx-ehsd/src/main/java/com/fjhx/ehsd/util/code/CodeEnum.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.util.code;
+package com.fjhx.ehsd.util.code;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -6,7 +6,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.sale.service.sample.SampleService;
+import com.fjhx.ehsd.service.sample.SampleService;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
 
@@ -17,7 +17,7 @@ import java.util.Map;
 public enum CodeEnum {
 
     //样品单
-    SAMPLE("SC-", "yyMM-", "code", 3, SampleService.class),
+    SAMPLE_CODE("YP-", "yyMM-", "code", 3, SampleService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

hx-ehsd/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -1,57 +0,0 @@
-package com.fjhx.sale.service.sample.impl;
-
-import com.fjhx.sale.entity.sample.po.Sample;
-import com.fjhx.sale.mapper.sample.SampleMapper;
-import com.fjhx.sale.service.sample.SampleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sample.vo.SampleVo;
-import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.sample.dto.SampleDto;
-import cn.hutool.core.bean.BeanUtil;
-
-
-/**
- * <p>
- * 样品单表 服务实现类
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-@Service
-public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> implements SampleService {
-
-    @Override
-    public Page<SampleVo> getPage(SampleSelectDto dto) {
-        IWrapper<Sample> wrapper = getWrapper();
-        wrapper.orderByDesc("s", Sample::getId);
-        Page<SampleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
-    }
-
-    @Override
-    public SampleVo detail(Long id) {
-        Sample Sample = this.getById(id);
-        SampleVo result = BeanUtil.toBean(Sample, SampleVo.class);
-        return result;
-    }
-
-    @Override
-    public void add(SampleDto sampleDto) {
-        this.save(sampleDto);
-    }
-
-    @Override
-    public void edit(SampleDto sampleDto) {
-        this.updateById(sampleDto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
-}

hx-ehsd/src/main/resources/mapper/sample/SampleMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.sale.mapper.sample.SampleMapper">
-    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleVo">
+<mapper namespace="com.fjhx.ehsd.mapper.sample.SampleMapper">
+    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleVo">
         select
             s.id,
             s.code,

hx-ehsd/src/main/resources/mapper/sample/SampleProductMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.sale.mapper.sample.SampleProductMapper">
-    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleProductVo">
+<mapper namespace="com.fjhx.ehsd.mapper.sample.SampleProductMapper">
+    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleProductVo">
         SELECT
             t1.id,
             t1.sample_id,

hx-ehsd/src/main/resources/mapper/sample/SampleProjectMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.sale.mapper.sample.SampleProjectMapper">
-    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleProjectVo">
+<mapper namespace="com.fjhx.ehsd.mapper.sample.SampleProjectMapper">
+    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleProjectVo">
         select
             sp.id,
             sp.contract_id,

hx-ehsd/src/main/resources/mapper/sample/SampleShipmentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.sale.mapper.sample.SampleShipmentMapper">
-    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleShipmentVo">
+<mapper namespace="com.fjhx.ehsd.mapper.sample.SampleShipmentMapper">
+    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleShipmentVo">
         select
             ss.id,
             ss.contract_id,

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -19,7 +19,6 @@ import com.fjhx.mes.service.work.WorkOrderService;
 import com.fjhx.mes.utils.code.CodeEnum;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.contract.impl.ContractProductServiceImpl;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractProductController.java

@@ -1,6 +1,5 @@
 package com.fjhx.sale.controller.contract;
 
-import com.fjhx.sale.entity.contract.vo.ContractVo;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsPdfController.java

@@ -1,9 +1,7 @@
 package com.fjhx.sale.controller.documents;
 
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.documents.vo.DocumentsPdfVo;
-import com.fjhx.sale.entity.documents.dto.DocumentsPdfSelectDto;
 import com.fjhx.sale.entity.documents.dto.DocumentsPdfDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.documents.DocumentsPdfService;

hx-sale/src/main/java/com/fjhx/sale/controller/quotation/QuotationPayController.java

@@ -4,8 +4,6 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.quotation.vo.QuotationPayVo;
 import com.fjhx.sale.entity.quotation.dto.QuotationPaySelectDto;
-import com.fjhx.sale.entity.quotation.dto.QuotationPayDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.quotation.QuotationPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 

hx-sale/src/main/java/com/fjhx/sale/controller/quotation/QuotationProductController.java

@@ -1,11 +1,6 @@
 package com.fjhx.sale.controller.quotation;
 
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.quotation.vo.QuotationProductVo;
-import com.fjhx.sale.entity.quotation.dto.QuotationProductSelectDto;
-import com.fjhx.sale.entity.quotation.dto.QuotationProductDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.quotation.QuotationProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 

hx-sale/src/main/java/com/fjhx/sale/controller/sale/SaleQuotationController.java

@@ -1,11 +1,7 @@
 package com.fjhx.sale.controller.sale;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
-import com.fjhx.customer.entity.customer.po.Customer;
-import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
@@ -15,7 +11,6 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.sale.SaleQuotationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.List;
 import java.util.Map;
 
 

hx-sale/src/main/java/com/fjhx/sale/controller/serviceContract/ServiceContractController.java

@@ -1,6 +1,5 @@
 package com.fjhx.sale.controller.serviceContract;
 
-import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
 import com.fjhx.sale.enums.ServiceContractEnum;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/ClaimContract.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.claim.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProduct.java

@@ -5,7 +5,6 @@ import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 import lombok.Getter;

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProject.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.contract.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/Documents.java

@@ -3,7 +3,6 @@ package com.fjhx.sale.entity.documents.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/DocumentsPdf.java

@@ -2,7 +2,6 @@ package com.fjhx.sale.entity.documents.po;
 
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/DocumentsProduct.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackDetailGoods.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.pack.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackDetailProduct.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.pack.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackShipment.java

@@ -1,9 +1,7 @@
 package com.fjhx.sale.entity.pack.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackShipmentVo.java

@@ -1,6 +1,5 @@
 package com.fjhx.sale.entity.pack.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import lombok.Getter;
 import lombok.Setter;

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationPay.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.quotation.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationProduct.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.quotation.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

@@ -3,7 +3,7 @@ package com.fjhx.sale.entity.sale.po;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/serviceContract/po/ServiceContract.java

@@ -1,10 +1,8 @@
 package com.fjhx.sale.entity.serviceContract.po;
 
 import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import java.math.BigDecimal;
 
 import lombok.Getter;

hx-sale/src/main/java/com/fjhx/sale/enums/FlowStatusEnum.java

@@ -1,51 +0,0 @@
-package com.fjhx.sale.enums;
-
-import org.apache.commons.collections4.MapUtils;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 流程审批状态枚举
- */
-public enum FlowStatusEnum {
-    DRAFT(0, "草稿"),
-    UNDER_REVIEW(10, "审批中"),
-    REJECT(20, "驳回"),
-    PASS(30,"通过"),
-    ;
-    private int key;
-
-    private String value;
-
-    private static Map<Integer, String> map = new LinkedHashMap<>();
-
-    FlowStatusEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static Map<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
-            return map;
-        }
-        for (FlowStatusEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -8,20 +8,19 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.FlowStatusEnum;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
-import com.fjhx.sale.enums.FlowStatusEnum;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.contract.ContractShipmentService;
 import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
-import com.ruoyi.common.utils.uuid.IdUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

hx-sale/src/main/java/com/fjhx/sale/flow/SaleQuotationFlow.java

@@ -7,20 +7,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.sale.entity.contract.po.Contract;
-import com.fjhx.sale.entity.contract.po.ContractProduct;
-import com.fjhx.sale.entity.contract.po.ContractProject;
-import com.fjhx.sale.entity.contract.po.ContractShipment;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
-import com.fjhx.sale.enums.FlowStatusEnum;
 import com.fjhx.sale.enums.SaleQuotationEnum;
-import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.contract.ContractProjectService;
-import com.fjhx.sale.service.contract.ContractService;
-import com.fjhx.sale.service.contract.ContractShipmentService;
 import com.fjhx.sale.service.quotation.QuotationPayService;
 import com.fjhx.sale.service.quotation.QuotationProductService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
@@ -28,7 +19,6 @@ import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 
 /**

hx-sale/src/main/java/com/fjhx/sale/flow/ServiceContractFlow.java

@@ -7,19 +7,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.sale.entity.quotation.po.QuotationPay;
-import com.fjhx.sale.entity.quotation.po.QuotationProduct;
-import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
-import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractPay;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractProduct;
-import com.fjhx.sale.enums.SaleQuotationEnum;
 import com.fjhx.sale.enums.ServiceContractEnum;
-import com.fjhx.sale.service.quotation.QuotationPayService;
-import com.fjhx.sale.service.quotation.QuotationProductService;
-import com.fjhx.sale.service.sale.SaleQuotationService;
 import com.fjhx.sale.service.serviceContract.ServiceContractPayService;
 import com.fjhx.sale.service.serviceContract.ServiceContractProductService;
 import com.fjhx.sale.service.serviceContract.ServiceContractService;

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractProductMapper.java

@@ -4,7 +4,6 @@ import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
-import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-sale/src/main/java/com/fjhx/sale/mapper/documents/DocumentsMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.sale.entity.documents.po.Documents;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.documents.vo.DocumentsVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackShipmentMapper.java

@@ -1,7 +1,6 @@
 package com.fjhx.sale.mapper.pack;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-sale/src/main/java/com/fjhx/sale/mapper/quotation/QuotationPayMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.quotation.vo.QuotationPayVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 

hx-sale/src/main/java/com/fjhx/sale/mapper/sale/SaleQuotationMapper.java

@@ -8,11 +8,9 @@ import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/mapper/serviceContract/ServiceContractMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.serviceContract.vo.ServiceContractVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 

hx-sale/src/main/java/com/fjhx/sale/mapper/serviceContract/ServiceContractPayMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.sale.entity.serviceContract.po.ServiceContractPay;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.serviceContract.vo.ServiceContractPayVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 

hx-sale/src/main/java/com/fjhx/sale/mapper/serviceContract/ServiceContractRecordMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.sale.entity.serviceContract.po.ServiceContractRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.serviceContract.vo.ServiceContractRecordVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -22,7 +22,6 @@ import com.fjhx.sale.entity.claim.dto.ClaimSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.claim.dto.ClaimDto;
 import cn.hutool.core.bean.BeanUtil;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractProductService.java

@@ -1,7 +1,6 @@
 package com.fjhx.sale.service.contract;
 
 import com.fjhx.sale.entity.contract.po.ContractProduct;
-import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -1,19 +1,11 @@
 package com.fjhx.sale.service.contract.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
-import com.fjhx.purchase.entity.purchase.po.Purchase;
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
-import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
-import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.mapper.contract.ContractProductMapper;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -1,8 +1,6 @@
 package com.fjhx.sale.service.documents.impl;
 
-import cn.hutool.core.lang.func.Func;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,7 +12,6 @@ import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
@@ -38,13 +35,11 @@ import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.obs.services.internal.ServiceException;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.documents.vo.DocumentsVo;
 import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.documents.dto.DocumentsDto;
 import cn.hutool.core.bean.BeanUtil;
 

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackService.java

@@ -7,8 +7,6 @@ import com.fjhx.sale.entity.pack.vo.PackVo;
 import com.fjhx.sale.entity.pack.dto.PackSelectDto;
 import com.fjhx.sale.entity.pack.dto.PackDto;
 
-import java.util.Map;
-
 
 /**
  * <p>

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailServiceImpl.java

@@ -3,7 +3,6 @@ package com.fjhx.sale.service.pack.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 import com.fjhx.sale.entity.pack.enums.PackShipmentStatusEnum;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackShipment;
@@ -24,7 +23,6 @@ import com.fjhx.sale.entity.pack.dto.PackDetailDto;
 import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackServiceImpl.java

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackShipmentServiceImpl.java

@@ -9,7 +9,6 @@ import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.obs.services.internal.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationPayServiceImpl.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.quotation.vo.QuotationPayVo;
 import com.fjhx.sale.entity.quotation.dto.QuotationPaySelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.quotation.dto.QuotationPayDto;
 import cn.hutool.core.bean.BeanUtil;
 

hx-sale/src/main/java/com/fjhx/sale/service/sale/SaleQuotationService.java

@@ -1,9 +1,7 @@
 package com.fjhx.sale.service.sale;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
-import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.sale.service.sale.impl;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
@@ -8,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.controller.utils.DateUtils;
-import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.area.utils.AreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
@@ -16,8 +14,6 @@ import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
 import com.fjhx.customer.service.customer.CustomerService;
-import com.fjhx.sale.entity.contract.po.Contract;
-import com.fjhx.sale.entity.contract.vo.ContractPdfInfoVo;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
@@ -40,7 +36,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
 import cn.hutool.core.bean.BeanUtil;
 

hx-sale/src/main/java/com/fjhx/sale/service/serviceContract/impl/ServiceContractPayServiceImpl.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.serviceContract.vo.ServiceContractPayVo;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractPaySelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/service/serviceContract/impl/ServiceContractRecordServiceImpl.java

@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.serviceContract.vo.ServiceContractRecordVo;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractRecordSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractRecordDto;
 import cn.hutool.core.bean.BeanUtil;
 

hx-sale/src/main/java/com/fjhx/sale/util/code/CodeEnum.java

@@ -6,7 +6,6 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.sale.entity.pack.po.Pack;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.pack.PackService;
 import com.obs.services.internal.ServiceException;