Merge remote-tracking branch 'origin/master'

hx-account/src/main/java/com/fjhx/account/controller/account/AccountManagementController.java

@@ -71,4 +71,12 @@ public class AccountManagementController {
         accountManagementService.delete(dto.getId());
     }
 
+    /**
+     * 导入账户表的数据
+     */
+    @PostMapping("/importsAmount")
+    public void importsAmount(@RequestBody AccountManagementDto dto) {
+        accountManagementService.importsAmount(dto);
+    }
+
 }

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountManagementDto.java

@@ -19,4 +19,6 @@ import java.util.List;
 public class AccountManagementDto extends AccountManagement {
     @TableField(exist = false)
     private List<AccountRemainder> accountRemainderList;
+
+    private String tenantId;
 }

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountManagement.java

@@ -81,4 +81,24 @@ public class AccountManagement extends BasePo {
     private String beneficiaryAddress;
 
 
+
+//    /**
+//     * 云帆ID
+//     */
+//    private String yfId;
+//
+//    /**
+//     * 云帆——归属公司id（common模块corporation表id）
+//     */
+//    private String yfCorporationId;
+//
+//    private String yfCreateUser;
+//
+//    private String yfUpdateUser;
+//
+//    private String tenantId;
+
+
+
+
 }

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRemainder.java

@@ -44,4 +44,9 @@ public class AccountRemainder extends BasePo {
      * 交易状态：10 收入，20支出
      */
     private String status ;
+
+    /**
+     * 交易状态：10 收入，20支出
+     */
+    private String tenantId;
 }

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountManagementMapper.java

@@ -1,13 +1,19 @@
 package com.fjhx.account.mapper.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fjhx.account.entity.account.dto.AccountManagementDto;
+import com.fjhx.account.entity.account.dto.FundAccount;
 import com.fjhx.account.entity.account.po.AccountManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountManagementVo;
+import com.ruoyi.common.annotation.TenantIgnore;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -24,4 +30,9 @@ public interface AccountManagementMapper extends BaseMapper<AccountManagement> {
      */
     Page<AccountManagementVo> getPage(@Param("page") Page<Object> page, @Param("ew")LambdaQueryWrapper<AccountManagement> wrapper);
 
+    /**
+     * 查询云帆资金账户表的信息
+     */
+    @TenantIgnore
+    List<FundAccount> importsAmount(AccountManagementDto dto);
 }

hx-account/src/main/java/com/fjhx/account/service/account/AccountManagementService.java

@@ -1,6 +1,7 @@
 package com.fjhx.account.service.account;
 
 import com.fjhx.account.entity.account.po.AccountManagement;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountManagementVo;
@@ -43,4 +44,8 @@ public interface AccountManagementService extends BaseService<AccountManagement>
      */
     void delete(Long id);
 
+    /**
+     * 导入账户表的数据
+     */
+    void importsAmount(AccountManagementDto dto);
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -2,7 +2,9 @@ package com.fjhx.account.service.account.impl;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.entity.account.po.AccountRemainder;
@@ -12,8 +14,16 @@ import com.fjhx.account.service.account.AccountManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.service.account.AccountRemainderService;
 import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.service.corporation.CorporationService;
 import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.annotation.TenantIgnore;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +35,7 @@ import com.fjhx.account.entity.account.dto.AccountManagementDto;
 import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -45,6 +56,12 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     @Autowired
     private AccountRunningWaterService accountRunningWaterService;
 
+    @Autowired
+    private CorporationService corporationService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 账户-管理表分页
      */
@@ -141,6 +158,102 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
                 .eq(AccountRemainder::getAccountManagementId,id));
     }
 
+    /**
+     * 导入账户表的数据
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    @TenantIgnore
+    public void importsAmount(AccountManagementDto dto) {
+        //查询云帆账户表的数据
+//        List<FundAccount> fundAccounts = baseMapper.importsAmount(dto);
+//        for (FundAccount fundAccount : fundAccounts) {
+//            //添加资金账户表的数据
+//            AccountManagement accountManagement = new AccountManagement();
+//            //查询多公司表
+//            if (ObjectUtil.isNotEmpty(fundAccount.getCompanyId())){
+//                DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
+//
+//                Corporation corporation = corporationService.getOne(Wrappers.<Corporation>lambdaQuery().eq(Corporation::getYfId,fundAccount.getCompanyId()));
+//                if(ObjectUtil.isNotEmpty(corporation)){
+//                    accountManagement.setCorporationId(corporation.getId());
+//                }
+//
+//                DynamicDataSourceContextHolder.poll();
+//            }
+//            accountManagement.setTenantId(fundAccount.getTenantId());
+//            accountManagement.setYfId(fundAccount.getId());
+//            accountManagement.setAlias(fundAccount.getName());
+//            accountManagement.setAccountOpening(fundAccount.getAccountNumber());
+//            accountManagement.setCreateTime(fundAccount.getCreateTime());
+//            accountManagement.setUpdateTime(fundAccount.getUpdateTime());
+//            accountManagement.setAccountOpening(fundAccount.getAccountNumber());
+//            //查询用户
+//            if (ObjectUtil.isNotEmpty(fundAccount.getCreateUser())){
+//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getCreateUser()));
+//                accountManagement.setCreateUser(sysUser.getUserId());
+//                DynamicDataSourceContextHolder.poll();
+//            }
+//
+//            if (ObjectUtil.isNotEmpty(fundAccount.getUpdateUser())){
+//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getUpdateUser()));
+//                accountManagement.setCreateUser(sysUser.getUserId());
+//                DynamicDataSourceContextHolder.poll();
+//            }
+//            accountManagement.setCreateTime(fundAccount.getCreateTime());
+//            accountManagement.setUpdateTime(fundAccount.getUpdateTime());
+//            baseMapper.insert(accountManagement);
+//
+//            //添加资金账户余额表的信息
+//            AccountRemainder accountRemainder = new AccountRemainder();
+//            accountRemainder.setTenantId(fundAccount.getTenantId());
+//            accountRemainder.setAccountManagementId(accountManagement.getId());
+//            //查询用户
+//            if (ObjectUtil.isNotEmpty(fundAccount.getCreateUser())){
+//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getCreateUser()));
+//                accountRemainder.setCreateUser(sysUser.getUserId());
+//                DynamicDataSourceContextHolder.poll();
+//            }
+//
+//            if (ObjectUtil.isNotEmpty(fundAccount.getUpdateUser())){
+//
+//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getUpdateUser()));
+//                accountRemainder.setCreateUser(sysUser.getUserId());
+//                DynamicDataSourceContextHolder.poll();
+//            }
+//            if (ObjectUtil.isNotEmpty(fundAccount.getRmbAmount())){
+//                accountRemainder.setId(IdWorker.getId());
+//                accountRemainder.setRemainder(fundAccount.getRmbAmount());
+//                accountRemainder.setCurrency("RMB");
+//                accountRemainderService.save(accountRemainder);
+//            }
+//            if (ObjectUtil.isNotEmpty(fundAccount.getDollarAmount())){
+//                accountRemainder.setId(IdWorker.getId());
+//                accountRemainder.setRemainder(fundAccount.getDollarAmount());
+//                accountRemainder.setCurrency("USD");
+//                accountRemainderService.save(accountRemainder);
+//            }
+//            if (ObjectUtil.isNotEmpty(fundAccount.getEuroAmount())){
+//                accountRemainder.setId(IdWorker.getId());
+//                accountRemainder.setRemainder(fundAccount.getEuroAmount());
+//                accountRemainder.setCurrency("EUR");
+//                accountRemainderService.save(accountRemainder);
+//            }
+//
+//            if (ObjectUtil.isNotEmpty(fundAccount.getSterlingAmount())){
+//                accountRemainder.setId(IdWorker.getId());
+//                accountRemainder.setRemainder(fundAccount.getSterlingAmount());
+//                accountRemainder.setCurrency("GBP");
+//                accountRemainderService.save(accountRemainder);
+//            }
+//        }
+
+    }
+
 
     /**
      * 添加账户-余额表的信息

hx-account/src/main/resources/mapper/account/AccountManagementMapper.xml

@@ -7,5 +7,8 @@
         from account_management am
             ${ew.customSqlSegment}
     </select>
+    <select id="importsAmount" resultType="com.fjhx.account.entity.account.dto.FundAccount">
+        select * from t_erp_fund_account where tenant_id = #{tenantId}
+    </select>
 
 </mapper>

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -12,7 +12,7 @@ import lombok.Setter;
  * 多公司配置
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @Getter
@@ -72,4 +72,9 @@ public class Corporation extends BasePo {
      */
     private String iaeeCode;
 
+    /**
+     * 进出口企业代码
+     */
+    private String yfId;
+
 }

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

@@ -31,11 +31,6 @@ public class Sample extends BasePo {
     private String code;
 
     /**
-     * 合同类型(1外销 2内销)
-     */
-    private Integer contractType;
-
-    /**
      * 合同模版ID
      */
     private Long contractTemplateId;
@@ -121,22 +116,12 @@ public class Sample extends BasePo {
     private Integer status;
 
     /**
-     * 合同状态
-     */
-    private Integer contractStatus;
-
-    /**
-     * 到款状态 0未到款  10部分到款  20已到款
-     */
-    private Integer refundStatus;
-
-    /**
      * 币种（字典account_currency）
      */
     private String currency;
 
     /**
-     * 合同金额
+     * 样品单金额
      */
     private BigDecimal amount;
 
@@ -146,11 +131,6 @@ public class Sample extends BasePo {
     private String paymentMethod;
 
     /**
-     * 贸易方式（字典trade_methods）
-     */
-    private String tradeMethods;
-
-    /**
      * 预付比例
      */
     private String advanceRatio;
@@ -171,11 +151,6 @@ public class Sample extends BasePo {
     private Long shroffAccountId;
 
     /**
-     * 质保期
-     */
-    private Integer warranty;
-
-    /**
      * 审核通过时间
      */
     private Date approvedDate;
@@ -201,11 +176,6 @@ public class Sample extends BasePo {
     private String deliveryTime;
 
     /**
-     * 是否结算 1已结算 0未结算
-     */
-    private Integer settlementStatus;
-
-    /**
      * 汇率json
      */
     private String currencyRateJson;
@@ -220,6 +190,36 @@ public class Sample extends BasePo {
      */
     private String ehsdJson;
 
+    /**
+     * beneficiaryName
+     */
+    private String beneficiaryName;
+
+    /**
+     * beneficiaryBank
+     */
+    private String beneficiaryBank;
+
+    /**
+     * beneficiaryBankAddress
+     */
+    private String beneficiaryBankAddress;
+
+    /**
+     * beneficiaryAddress
+     */
+    private String beneficiaryAddress;
+
+    /**
+     * beneficiaryName
+     */
+    private String swiftCode;
+
+    /**
+     * beneficiaryAccountNumber
+     */
+    private String beneficiaryAccountNumber;
+
 
     /**
      * 样品单产品列表

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

@@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.purchase.entity.arrival.po.Arrival;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.quality.po.Quality;
+import com.fjhx.purchase.entity.sales.po.SalesReturn;
 import com.fjhx.purchase.service.arrival.ArrivalService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.quality.QualityService;
+import com.fjhx.purchase.service.sales.SalesReturnService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
@@ -31,7 +33,7 @@ public enum CodeEnum {
     //质检
     QUALITY("ZJ", "yyMM-", "code", 3, QualityService.class),
     //退货
-    SALES_RETURN("ZJ", "yyMM-", "code", 3, QualityService.class),
+    SALES_RETURN("ZJ", "yyMM-", "code", 3, SalesReturnService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

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

@@ -4,6 +4,7 @@ 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 com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -259,6 +260,12 @@ public class Contract extends BasePo {
     private Integer version;
 
     /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+
+    /**
      * 合同产品列表
      */
     @TableField(exist = false)

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

@@ -84,6 +84,7 @@ public class ContractFlow extends FlowDelegate {
             }
             contractShipmentService.saveBatch(contractShipmentList);
         }
+        ObsFileUtil.saveFile(contract.getFileList(),contract.getId());
         return contract.getId();
     }
 

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

@@ -6,8 +6,12 @@ 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.serviceContract.po.ServiceContract;
+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.serviceContract.ServiceContractService;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
 
@@ -20,10 +24,11 @@ public enum CodeEnum {
     //外销合同
     CONTRACT("SC-", "yyMM-", "code", 3, ContractService.class),
     //报价单
-    SALE_QUOTATION("GSQT-", "yyMM-", "code", 3, ContractService.class),
+    SALE_QUOTATION("GSQT-", "yyMM-", "code", 3, SaleQuotationService.class),
+    //包装
     PACK("PACK-", "yyMM-", "code", 3, PackService.class),
     //服务合同
-    SERVICE_CONTRACT("PO-", "yyMM-", "code", 3, ContractService.class),
+    SERVICE_CONTRACT("PO-", "yyMM-", "code", 3, ServiceContractService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/po/SupplierInfo.java

@@ -73,4 +73,36 @@ public class SupplierInfo extends BasePo {
      */
     private String victoriatouristJson;
 
+    /**
+     * 账户名
+     */
+    private String openingName;
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountOpening;
+
+    /**
+     * 联行号
+     */
+    private String interbankNumber;
+
+    /**
+     * 账期（/天）
+     */
+    private Integer accountPeriod;
+
+    /**
+     * 账期说明
+     */
+    private String accountPeriodRemark;
+
+
+
 }

hx-supply/src/main/resources/mapper/supplier/SupplierInfoMapper.xml

@@ -3,22 +3,7 @@
 <mapper namespace="com.fjhx.supply.mapper.supplier.SupplierInfoMapper">
     <select id="getPage" resultType="com.fjhx.supply.entity.supplier.vo.SupplierInfoVo">
         select
-            si.id,
-            si.code,
-            si.type,
-            si.name,
-            si.country_id,
-            si.province_id,
-            si.city_id,
-            si.area_detail,
-            si.contact_person,
-            si.contact_number,
-            si.remark,
-            si.create_user,
-            si.create_time,
-            si.update_user,
-            si.update_time,
-            si.victoriatourist_json
+           si.*
         from supplier_info si
             ${ew.customSqlSegment}
     </select>