-同步代码

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheet/vo/QuotationSheetBaseVO.java

@@ -97,12 +97,12 @@ public class QuotationSheetBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime applyTime;
 
-    @Schema(description = "申请人")
-    private Long applicant;
-
     @Schema(description = "物料id集合")
     private String materialIdList;
 
+    @Schema(description = "申请人")
+    private Long applicant;
+
     @Schema(description = "申请人部门id", example = "10907")
     private Long deptId;
 

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheet;
 
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -24,7 +25,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class QuotationSheetDO extends BaseDO {
+public class QuotationSheetDO extends TenantBaseDO {
 
     /**
      * 主键

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/suppliercompany/SupplierCompanyDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.bs.dal.dataobject.suppliercompany;
 
 import cn.iocoder.yudao.framework.common.pojo.ImageVo;
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 import java.util.*;
@@ -24,7 +25,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SupplierCompanyDO extends BaseDO {
+public class SupplierCompanyDO extends TenantBaseDO {
 
     /**
      * 主键

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheet/QuotationSheetService.java

@@ -3,16 +3,22 @@ package cn.iocoder.yudao.module.bs.service.quotationsheet;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.bs.controller.admin.quotationsheet.vo.*;
+import cn.iocoder.yudao.module.bs.dal.dataobject.expenseapply.ExpenseApplyDO;
 import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheet.QuotationSheetDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import com.github.yulichang.base.MPJBaseService;
 
 /**
  * 报价单 Service 接口
  *
  * @author 芋道源码
  */
-public interface QuotationSheetService {
+public interface QuotationSheetService  extends MPJBaseService<QuotationSheetDO> {
 
+
+
+    //报价单流程ID
+    public static final String PROCESS_KEY = "quotation_sheet_seq";
     /**
      * 创建报价单
      *

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheet/QuotationSheetServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bs.service.quotationsheet;
 
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -23,7 +24,7 @@ import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class QuotationSheetServiceImpl implements QuotationSheetService {
+public class QuotationSheetServiceImpl extends MPJBaseServiceImpl<QuotationSheetMapper, QuotationSheetDO> implements QuotationSheetService {
 
     @Resource
     private QuotationSheetMapper quotationSheetMapper;

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/suppliercompany/SupplierCompanyService.java

@@ -3,15 +3,17 @@ package cn.iocoder.yudao.module.bs.service.suppliercompany;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.bs.controller.admin.suppliercompany.vo.*;
+import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheet.QuotationSheetDO;
 import cn.iocoder.yudao.module.bs.dal.dataobject.suppliercompany.SupplierCompanyDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import com.github.yulichang.base.MPJBaseService;
 
 /**
  * 供应商信息 Service 接口
  *
  * @author 芋道源码
  */
-public interface SupplierCompanyService {
+public interface SupplierCompanyService  extends MPJBaseService<SupplierCompanyDO> {
 
     /**
      * 创建供应商信息

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/suppliercompany/SupplierCompanyServiceImpl.java

@@ -3,7 +3,10 @@ package cn.iocoder.yudao.module.bs.service.suppliercompany;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.UserCreateReqDTO;
+import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheet.QuotationSheetDO;
+import cn.iocoder.yudao.module.bs.dal.mysql.quotationsheet.QuotationSheetMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -29,7 +32,7 @@ import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class SupplierCompanyServiceImpl implements SupplierCompanyService {
+public class SupplierCompanyServiceImpl extends MPJBaseServiceImpl<SupplierCompanyMapper, SupplierCompanyDO> implements SupplierCompanyService {
 
     @Resource
     private SupplierCompanyMapper supplierCompanyMapper;
@@ -44,6 +47,7 @@ public class SupplierCompanyServiceImpl implements SupplierCompanyService {
         SupplierCompanyDO supplierCompany = SupplierCompanyConvert.INSTANCE.convert(createReqVO);
         String companyNumber = numberCreate();
         supplierCompany.setCompanyNumber(companyNumber);
+        supplierCompany.setDeleted(false);
         supplierCompanyMapper.insert(supplierCompany);
         UserCreateReqDTO userCreateReqDTO=new UserCreateReqDTO();
         userCreateReqDTO.setPassword("123456Aa@");