样品单

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

@@ -1,98 +0,0 @@
-package com.fjhx.ehsd.util.code;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-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.ehsd.service.sample.SampleService;
-import com.obs.services.internal.ServiceException;
-import lombok.Getter;
-
-import java.util.Date;
-import java.util.Map;
-
-@Getter
-public enum CodeEnum {
-
-    //样品单
-    SAMPLE_CODE("YP-", "yyMM-", "code", 3, SampleService.class),
-    ;
-
-    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
-        this.prefix = prefix;
-        this.dateFormat = dateFormat;
-        this.length = length;
-        this.codeFieldName = codeFieldName;
-        this.service = SpringUtil.getBean(serviceCls);
-    }
-
-    // 编码前缀
-    private final String prefix;
-    // 编码加日期规则
-    private final String dateFormat;
-    // 长度
-    private final Integer length;
-    // 编码字段名
-    private final String codeFieldName;
-    // service
-    private final IService<?> service;
-
-    /**
-     * 获取键值对
-     */
-    public String getCode() {
-        String itemPrefix;
-
-        if (ObjectUtil.isNotEmpty(dateFormat)) {
-            Date date = new Date();
-            String format = DateUtil.format(date, dateFormat);
-            itemPrefix = prefix + format;
-        } else {
-            itemPrefix = prefix;
-        }
-
-        Object obj = service.query()
-                .likeRight(codeFieldName, itemPrefix)
-                .orderByDesc(codeFieldName)
-                .last("limit 1")
-                .one();
-
-        if (obj == null) {
-            return itemPrefix + autoGenericCode(length, 0);
-        }
-
-        Map<String, Object> map = Convert.toMap(String.class, Object.class, obj);
-
-        String code = Convert.toStr(map.get(CharSequenceUtil.toCamelCase(codeFieldName)));
-        Integer codeNum = Convert.toInt(code.substring(itemPrefix.length()));
-        if (ObjectUtil.isEmpty(codeNum)) {
-            throw new ServiceException("自定义编码与系统编码生成规则冲突，暂时无法生成编码，请联系管理员");
-        }
-
-        return itemPrefix + autoGenericCode(length, codeNum);
-    }
-
-    /**
-     * 获取键值对
-     */
-    public String getCode(String code) {
-        if (ObjectUtil.isNotEmpty(code)) {
-            Long count = service.query().eq(codeFieldName, code).count();
-            if (count != 0) {
-                throw new ServiceException("编码已存在");
-            }
-            return code;
-        } else {
-            return getCode();
-        }
-    }
-    /**
-     * 不够位数的在前面补0，保留num的长度位数字
-     */
-    private static String autoGenericCode(int length, Integer codeNum) {
-        return String.format("%0" + length + "d", codeNum + 1);
-    }
-
-}

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

@@ -1,12 +1,14 @@
-package com.fjhx.ehsd.controller.sample;
+package com.fjhx.sale.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.ehsd.entity.sample.vo.SampleVo;
-import com.fjhx.ehsd.entity.sample.dto.SampleSelectDto;
-import com.fjhx.ehsd.entity.sample.dto.SampleDto;
+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.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.ehsd.service.sample.SampleService;
+import com.fjhx.sale.service.sample.SampleService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 

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

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

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

@@ -1,9 +1,11 @@
-package com.fjhx.ehsd.controller.sample;
+package com.fjhx.sale.controller.sample;
 
-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 com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.sale.entity.sample.dto.SampleProjectDto;
+import com.fjhx.sale.entity.sample.dto.SampleProjectSelectDto;
+import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
+import com.fjhx.sale.service.sample.SampleProjectService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.BaseSelectDto;

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

@@ -1,9 +1,11 @@
-package com.fjhx.ehsd.controller.sample;
+package com.fjhx.sale.controller.sample;
 
-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 com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.sale.entity.sample.dto.SampleShipmentDto;
+import com.fjhx.sale.entity.sample.dto.SampleShipmentSelectDto;
+import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
+import com.fjhx.sale.service.sample.SampleShipmentService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.BaseSelectDto;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.ehsd.entity.sample.po;
+package com.fjhx.sale.entity.sample.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.file.entity.ObsFile;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.ehsd.flow;
+package com.fjhx.sale.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -9,17 +9,17 @@ 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.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.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.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.ehsd.util.code.CodeEnum;
+import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
 import org.springframework.stereotype.Component;
 
@@ -32,7 +32,7 @@ import java.util.List;
  * @DATE:2023/4/3 17:38
  */
 @Component
-@DS(SourceConstant.EHSD)
+@DS(SourceConstant.SALE)
 public class SampleFlow extends FlowDelegate {
 
 
@@ -85,6 +85,7 @@ public class SampleFlow extends FlowDelegate {
             sampleShipmentService.saveBatch(sampleShipmentList);
         }
         return sample.getId();
+
     }
 
     /**

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
-package com.fjhx.ehsd.service.sample;
+package com.fjhx.sale.service.sample;
 
-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.sale.entity.sample.dto.SampleProductDto;
+import com.fjhx.sale.entity.sample.dto.SampleProductSelectDto;
+import com.fjhx.sale.entity.sample.po.SampleProduct;
+import com.fjhx.sale.entity.sample.vo.SampleProductVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

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

@@ -1,9 +1,9 @@
-package com.fjhx.ehsd.service.sample;
+package com.fjhx.sale.service.sample;
 
-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.sale.entity.sample.dto.SampleProjectDto;
+import com.fjhx.sale.entity.sample.dto.SampleProjectSelectDto;
+import com.fjhx.sale.entity.sample.po.SampleProject;
+import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

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

@@ -1,11 +1,11 @@
-package com.fjhx.ehsd.service.sample;
+package com.fjhx.sale.service.sample;
 
-import com.fjhx.ehsd.entity.sample.po.Sample;
+import com.fjhx.sale.entity.sample.po.Sample;
 import com.ruoyi.common.core.service.BaseService;
 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.fjhx.ehsd.entity.sample.dto.SampleDto;
+import com.fjhx.sale.entity.sample.vo.SampleVo;
+import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
+import com.fjhx.sale.entity.sample.dto.SampleDto;
 
 
 /**

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

@@ -1,9 +1,9 @@
-package com.fjhx.ehsd.service.sample;
+package com.fjhx.sale.service.sample;
 
-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.sale.entity.sample.dto.SampleShipmentDto;
+import com.fjhx.sale.entity.sample.dto.SampleShipmentSelectDto;
+import com.fjhx.sale.entity.sample.po.SampleShipment;
+import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

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

@@ -1,14 +1,16 @@
-package com.fjhx.ehsd.service.sample.impl;
+package com.fjhx.sale.service.sample.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 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.common.constant.SourceConstant;
+import com.fjhx.sale.entity.sample.dto.SampleProductDto;
+import com.fjhx.sale.entity.sample.dto.SampleProductSelectDto;
+import com.fjhx.sale.entity.sample.po.SampleProduct;
+import com.fjhx.sale.entity.sample.vo.SampleProductVo;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.ehsd.mapper.sample.SampleProductMapper;
-import com.fjhx.ehsd.service.sample.SampleProductService;
+import com.fjhx.sale.mapper.sample.SampleProductMapper;
+import com.fjhx.sale.service.sample.SampleProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.SqlField;

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

@@ -1,11 +1,13 @@
-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;
+package com.fjhx.sale.service.sample.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.sale.entity.sample.dto.SampleProjectDto;
+import com.fjhx.sale.entity.sample.dto.SampleProjectSelectDto;
+import com.fjhx.sale.entity.sample.po.SampleProject;
+import com.fjhx.sale.entity.sample.vo.SampleProjectVo;
+import com.fjhx.sale.mapper.sample.SampleProjectMapper;
+import com.fjhx.sale.service.sample.SampleProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -1,12 +1,14 @@
-package com.fjhx.ehsd.service.sample.impl;
+package com.fjhx.sale.service.sample.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 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.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 com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -14,10 +16,10 @@ 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.fjhx.sale.entity.sample.vo.SampleVo;
+import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.ehsd.entity.sample.dto.SampleDto;
+import com.fjhx.sale.entity.sample.dto.SampleDto;
 import cn.hutool.core.bean.BeanUtil;
 
 import java.util.List;

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

@@ -1,11 +1,13 @@
-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;
+package com.fjhx.sale.service.sample.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.sale.entity.sample.dto.SampleShipmentDto;
+import com.fjhx.sale.entity.sample.dto.SampleShipmentSelectDto;
+import com.fjhx.sale.entity.sample.po.SampleShipment;
+import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
+import com.fjhx.sale.mapper.sample.SampleShipmentMapper;
+import com.fjhx.sale.service.sample.SampleShipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -11,6 +11,7 @@ import com.fjhx.sale.flow.SaleQuotationFlow;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.pack.PackService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
+import com.fjhx.sale.service.sample.SampleService;
 import com.fjhx.sale.service.serviceContract.ServiceContractService;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
@@ -29,6 +30,8 @@ public enum CodeEnum {
     PACK("PACK-", "yyMM-", "code", 3, PackService.class),
     //服务合同
     SERVICE_CONTRACT("PO-", "yyMM-", "code", 3, ServiceContractService.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/resources/mapper/sample/SampleMapper.xml → hx-sale/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.ehsd.mapper.sample.SampleMapper">
-    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleVo">
+<mapper namespace="com.fjhx.sale.mapper.sample.SampleMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleVo">
         select
            *
         from sample s

hx-ehsd/src/main/resources/mapper/sample/SampleProductMapper.xml → hx-sale/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.ehsd.mapper.sample.SampleProductMapper">
-    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleProductVo">
+<mapper namespace="com.fjhx.sale.mapper.sample.SampleProductMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleProductVo">
         SELECT
             t1.id,
             t1.sample_id,

hx-ehsd/src/main/resources/mapper/sample/SampleProjectMapper.xml → hx-sale/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.ehsd.mapper.sample.SampleProjectMapper">
-    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleProjectVo">
+<mapper namespace="com.fjhx.sale.mapper.sample.SampleProjectMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleProjectVo">
         select
             sp.id,
             sp.contract_id,

hx-ehsd/src/main/resources/mapper/sample/SampleShipmentMapper.xml → hx-sale/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.ehsd.mapper.sample.SampleShipmentMapper">
-    <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleShipmentVo">
+<mapper namespace="com.fjhx.sale.mapper.sample.SampleShipmentMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleShipmentVo">
         select
             ss.id,
             ss.contract_id,