Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/common/config/properties/ProjectApisProperties.java

@@ -0,0 +1,21 @@
+package com.qs.serve.common.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author YenHex
+ * @since 2023/9/7
+ */
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "project.apis")
+public class ProjectApisProperties {
+
+    /** 支付接口 */
+    private String costToPay;
+
+}

src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java

@@ -97,11 +97,18 @@ public class BmsSupplierAddressApi {
         BmsSupplier supplier = AuthContextUtils.getCurrentSupplier();
         param.setSupplierId(param.getSupplierId());
         BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
+        if(param.getDefaultFlag().equals(1)){
+            if(supplierAddress!=null){
+                supplierAddress.setDefaultFlag(0);
+                bmsSupplierAddressService.updateById(supplierAddress);
+            }
+        }else {
             if(supplierAddress==null){
                 param.setDefaultFlag(1);
             }else {
                 param.setDefaultFlag(0);
             }
+        }
         boolean result = bmsSupplierAddressService.save(param);
         return R.isTrue(result);
     }
@@ -111,9 +118,9 @@ public class BmsSupplierAddressApi {
      * @param id 地址ID
      * @return
      */
-    @PostMapping("/setDefault")
+    @GetMapping("/setDefault")
     @Transactional(rollbackFor = Exception.class)
-    public R<?> setDefault(@Valid Long id){
+    public R<?> setDefault(Long id){
         BmsSupplier supplier = AuthContextUtils.getCurrentSupplier();
         BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getById(id);
         if(!supplierAddress.getSupplierId().toString().equals(supplier.getId())){

src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterVo.java

@@ -0,0 +1,20 @@
+package com.qs.serve.modules.bms.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2022/11/11
+ */
+@Data
+public class BmsCostCenterVo {
+
+    /** 科目名称 */
+    private String name;
+
+    /** 科目编码 */
+    private String code;
+
+    /** 备注 */
+    private String remark;
+}

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java

@@ -274,6 +274,10 @@ public class BmsRegion2ServiceImpl extends ServiceImpl<BmsRegion2Mapper,BmsRegio
         List<BmsRegion2> regionList =  listChild(pid);
         if(regionList.size()>0){
             regionList = regionList.stream().map(a->{
+                String[] pars = parRegion.getPathIds().split("_");
+                if(Arrays.stream(pars).anyMatch(v->v.equals(a.getId()))||pars.length>4){
+                    Assert.throwEx("出现递归数据");
+                }
                 a.setPathIds(parRegion.getPathIds()+"_"+a.getId());
                 a.setPathNames(parRegion.getPathNames()+"_"+a.getName());
                 return a;

src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java

@@ -33,6 +33,7 @@ public class SysSyncLog implements Serializable {
 
     /** 来自系统 */
     @Length(max = 255,message = "来自系统长度不能超过255字")
+    @TableField(value = "form_plat")
     private String from;
 
     /** 请求地址 */

src/main/java/com/qs/serve/modules/sys/entity/SysUserCodeMath.java

@@ -0,0 +1,89 @@
+package com.qs.serve.modules.sys.entity;
+
+import java.time.LocalDate;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 用户编码对照表 实体类
+ * @author YenHex
+ * @since 2023-09-08
+ */
+@Data
+@TableName("sys_user_code_math")
+public class SysUserCodeMath implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 旧编码 */
+    @Length(max = 255,message = "旧编码长度不能超过255字")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String sourCode;
+
+    /** 当前编码 */
+    @Length(max = 255,message = "当前编码长度不能超过255字")
+    private String currCode;
+
+    /** 用户名称 */
+    @Length(max = 255,message = "用户名称长度不能超过255字")
+    private String userName;
+
+    /** 创建时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 最后更新时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    /** 所属租户 */
+    @JsonIgnore
+    @JsonProperty
+    private String tenantId;
+
+    /** 创建人 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /** 更新人 */
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    /** 逻辑删除标记（0：显示；1：隐藏） */
+    @JsonIgnore
+    @JsonProperty
+    private String delFlag;
+
+
+	public static SysUserCodeMath toNewObject(SysUserCodeMath source){
+		SysUserCodeMath userCodeMath = new SysUserCodeMath();
+		userCodeMath.setSourCode(source.getSourCode());
+		userCodeMath.setCurrCode(source.getCurrCode());
+		userCodeMath.setUserName(source.getUserName());
+		userCodeMath.setCreateTime(source.getCreateTime());
+		userCodeMath.setUpdateTime(source.getUpdateTime());
+		userCodeMath.setTenantId(source.getTenantId());
+		userCodeMath.setCreateBy(source.getCreateBy());
+		userCodeMath.setUpdateBy(source.getUpdateBy());
+		userCodeMath.setDelFlag(source.getDelFlag());
+		return userCodeMath;
+	}
+
+}
+

src/main/java/com/qs/serve/modules/sys/mapper/SysUserCodeMathMapper.java

@@ -0,0 +1,22 @@
+package com.qs.serve.modules.sys.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.modules.sys.entity.SysUserCodeMath;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 用户编码对照表 Mapper
+ * @author YenHex
+ * @date 2023-09-08
+ */
+public interface SysUserCodeMathMapper extends BaseMapper<SysUserCodeMath> {
+
+
+    @InterceptorIgnore(tenantLine = "true")
+    @Select("select `curr_code` from sys_user_code_math where sour_code = #{oldCode} limit 1 ")
+    String getNewCode(@Param("oldCode") String oldCode);
+
+}
+

src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java

@@ -78,6 +78,8 @@ public interface TbsSeeYonConst {
     String OA_USER_INFO = "/process/getUserByCode";
     String OA_USER_LIST_1 = "/process/getUsersList";
 
+    String TASK_SYNC_DISPATCH = "/task/dispatch";
+
     /** 客户账单余额 */
     String ERP_CUS_AMOUNT = "/erp/customer/amount";
     String ERP_CUS_INV_PRICE = "/erp/inventory/invPrices";

src/main/java/com/qs/serve/modules/third/PortalBmsController.java

@@ -0,0 +1,52 @@
+package com.qs.serve.modules.third;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.modules.bms.entity.BmsCostCenter;
+import com.qs.serve.modules.bms.entity.vo.BmsCostCenterTreeVo;
+import com.qs.serve.modules.bms.entity.vo.BmsCostCenterVo;
+import com.qs.serve.modules.bms.service.BmsCostCenterService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author YenHex
+ * @since 2023/9/7
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("thirty/bms")
+public class PortalBmsController {
+
+    private BmsCostCenterService bmsCostCenterService;
+
+    /**
+     * 树查询
+     * @return
+     */
+    @GetMapping("/center")
+    public List<BmsCostCenterVo> getTree(){
+        List<BmsCostCenter> list = bmsCostCenterService.list(
+                new LambdaQueryWrapper<BmsCostCenter>()
+                .eq(BmsCostCenter::getVisibleFlag,1)
+                .orderByDesc(BmsCostCenter::getId));
+        List<BmsCostCenterVo> treeVoList = list.stream().map(obj->
+                CopierUtil.copy(obj,new BmsCostCenterVo())
+        ).collect(Collectors.toList());
+        return treeVoList;
+    }
+
+
+
+
+}

src/main/java/com/qs/serve/modules/third/PortalOfCostController.java

@@ -57,6 +57,7 @@ public class PortalOfCostController {
             syncLog.setSuccessStatus(1);
         } catch (Exception e) {
             syncLog.setFailReason(e.getMessage());
+            return R.error(e.getMessage());
         }
         sysSyncLogService.save(syncLog);
         return R.ok();

src/main/java/com/qs/serve/modules/third/entity/ThirtyVerification.java

@@ -0,0 +1,144 @@
+package com.qs.serve.modules.third.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.*;
+import java.math.BigDecimal;
+
+/**
+ * @version 1.0
+ * @Author Ken Tam
+ * @Date 2023-09-07 9:01
+ * @注释 CMS已经完成的核销单实体类
+ */
+@Getter
+@Setter
+public class ThirtyVerification {
+
+    private String cacc = "001";
+
+    /**
+     * 原销路通中间表 apticlaimNum
+     */
+    @NotNull(message = "核销编码不能为空")
+    @Size(max = 30,min = 1,message = "编码长度不符合要求")
+    private String verificationCode;
+
+    /**
+     * 活动主题
+     * 原销路通中间表 apticlaim_zhuTi
+     */
+    @NotNull(message = "活动主题不能为空")
+    private String activityTitle = "";
+
+    /**
+     * 费用申请编码
+     */
+    @Null(message = "不能传入活动编码")
+    private String activityCode;
+
+    /**
+     * 核销创建日期不能为空
+     * 原销路通中间表 apticlaim_create_datetime
+     * 时间格式应为：yyyy-MM-dd HH:mm:ss
+     */
+    private String createDate;
+
+    /**
+     * 原销路通中间表 apticlaim_effdate
+     * 应该成费用对应的活动开始日期 yyyy-MM-dd HH:mm:ss
+     */
+    private String startDate;
+
+    /**
+     * 原销路通中间表 apticlaim_effdate
+     * 应该成费用对应的活动结束日期
+     * yyyy-MM-dd HH:mm:ss
+     */
+    private String endDate;
+
+    /**
+     * 中间表无该字段，用途不明确
+     */
+    private String kaCode = "";
+
+    /**
+     * 中间表无该字段，用途不明确
+     */
+    private Integer kaMdSl = 0;
+
+    /**
+     * 对应 apticlaim_exp_acct 科目编码
+     */
+    @NotNull(message = "科目编码不能为空")
+    private String subjectCode;
+
+    @NotNull(message = "科目名称不能为空")
+    private String subjectName;
+
+    /**
+     * 原销路通 apticlaim_amt + apticlaim_amt_tax，含税核销金额
+     */
+    @DecimalMax(value = "100000000",message = "核销金额不能大于一亿，请检查数据")
+    @DecimalMin(value = "0",message = "核销金额不能小于0")
+    @NotNull(message = "核销金额不能为空")
+    private BigDecimal money;
+
+    /**
+     * 中间表无该字段，用途不明确
+     */
+    private BigDecimal xsje = BigDecimal.ZERO;
+
+    /**
+     * 中间表无该字段，用途不明确
+     */
+    private BigDecimal tmSl = BigDecimal.ZERO;
+
+    /**
+     * cFyMemo 中间表无该字段
+     */
+    private String memo = "";
+
+    private String createUser = "demo - demo";
+
+    /**
+     * 对应 apticlaim_create_datetime
+     * 时间格式应为：yyyy-MM-dd HH:mm:ss
+     */
+    @NotNull(message = "创建时间不能为空")
+    private String createTime;
+
+    private String checkUser = "demo - demo";
+
+    /**
+     * 对应 apticlaim_create_datetime
+     * 时间格式应为：yyyy-MM-dd HH:mm:ss
+     */
+    private String checkTime;
+
+    /**
+     * 对应 apticlaim_addr
+     */
+    @NotNull(message = "客户编码不能为空")
+    private String cusCode;
+
+    @NotNull(message = "客户名称不能为空")
+    private String cusName;
+
+    /**
+     * 对应 apticlaim_recid
+     */
+    @NotNull(message = "id不能为空")
+    private String recId;
+
+    /**
+     * 对应apticlaim_id，
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+
+}

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.third.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.config.properties.ProjectApisProperties;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.ResultFlag;
 import com.qs.serve.common.util.*;
@@ -23,6 +24,7 @@ import com.qs.serve.modules.seeyon.entity.XltApticlaim;
 import com.qs.serve.modules.seeyon.entity.XltPaymentRecord;
 import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
@@ -30,10 +32,7 @@ import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
 import com.qs.serve.modules.tbs.service.*;
-import com.qs.serve.modules.third.entity.AptPolicyPayment;
+import com.qs.serve.modules.third.entity.*;
-import com.qs.serve.modules.third.entity.ProcessCreateCostApplyBo;
-import com.qs.serve.modules.third.entity.ProcessCreatePolicyCostBo;
-import com.qs.serve.modules.third.entity.ProcessGoodsItem;
 import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
 import com.qs.serve.modules.tzc.entity.TzcPolicyGoodsSync;
 import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
@@ -52,6 +51,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.RoundingMode;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -67,6 +67,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class PortalOfCostApplication {
 
+    private SysUserCodeMathMapper userCodeMathMapper;
+
     private TbsActivityService activityService;
     private TbsActivityCenterService activityCenterService;
     private TbsActivitySubjectService activitySubjectService;
@@ -98,6 +100,8 @@ public class PortalOfCostApplication {
     private TzcPolicyGoodsSyncService tzcPolicyGoodsSyncService;
     private final XiaoLuTonService xiaoLuTonService;
 
+    private ProjectApisProperties projectApisProperties;
+
 
     @Transactional(rollbackFor = Exception.class)
     public void syncXltPolicyItemPayment(AptPolicyPayment createBo){
@@ -523,6 +527,12 @@ public class PortalOfCostApplication {
     @Transactional(rollbackFor = Exception.class)
     public void createCostProcess(ProcessCreateCostApplyBo createBo){
         SysUser user = userService.getByAccount(createBo.getUserCode());
+        if(user==null){
+            String newUcode = userCodeMathMapper.getNewCode(createBo.getUserCode());
+            if(newUcode!=null){
+                user = userService.getByAccount(newUcode);
+            }
+        }
         if(user==null){Assert.throwEx("用户不存在，请重新编辑");}
         BmsSupplier supplier = supplierService.getByCode(createBo.getCustomerCode(),createBo.getCustomerBelong());
         if(supplier==null){Assert.throwEx("客户不存在，请重新编辑");}
@@ -565,8 +575,7 @@ public class PortalOfCostApplication {
         String costCode = createBo.getCostCode();
         String costTheme = createBo.getCostTheme();
 
-        String random = String.format("%03d",new Random().nextInt(999));
+        String activityCode = costCode;
-        String activityCode = "G"+ StringUtils.genShortId() + random;
 
         String activityTitle = createBo.getActivityTitle();
         if(!StringUtils.hasText(activityTitle)){
@@ -720,6 +729,9 @@ public class PortalOfCostApplication {
 
         //不匹配的商品，保存到无预算表
         List<TbsBudgetCostItem> unMatchBudgetItem =  budgetCostResult.getBudgetUnMatchList();
+        if(unMatchBudgetItem.size()>0){
+            Assert.throwEx("未能匹配到预算");
+        }
         List<TbsCostUnItem> costUnItemList = new ArrayList<>();
         if(CollectionUtil.isNotEmpty(unMatchBudgetItem)){
             for (TbsBudgetCostItem budgetCostItem : unMatchBudgetItem) {
@@ -729,7 +741,6 @@ public class PortalOfCostApplication {
         }
         costUnItemService.saveBatch(costUnItemList);
 
-        //TODO 修改预算日志，记录政策使用情况
         //匹配的商品，生成预算日志
         List<TbsBudgetCostItem> matchBudgetItem =  budgetCostResult.getBudgetMatchList();
         List<TbsBudgetLog> budgetLogList = new ArrayList<>();
@@ -784,36 +795,61 @@ public class PortalOfCostApplication {
         verificationSubject.setCountSession(0);
         verificationSubjectService.save(verificationSubject);
 
+        //保存支付信息
+        String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+        ThirtyVerification tv = new ThirtyVerification();
+        tv.setVerificationCode(verificationSubject.getVerificationSubCode());
+        tv.setActivityTitle(activityTitle);
+        tv.setActivityCode(activityCode);
+        tv.setCreateDate(timeString);
+        tv.setStartDate(timeString);
+        tv.setEndDate(timeString);
+        tv.setSubjectCode(subject.getSubjectCode());
+        tv.setSubjectName(subject.getSubjectName());
+        tv.setMoney(totalAmount);
+        //tv.setCreateUser();
+        tv.setCreateTime(timeString);
+        tv.setCheckUser(user.getName());
+        tv.setCheckTime(timeString);
+        tv.setCusCode(supplier.getCode());
+        tv.setCusName(supplier.getName());
+        tv.setRecId(verificationSubject.getVerificationSubCode());
+        String COST_TO_PAY_API = projectApisProperties.getCostToPay();
+        String json = JsonUtil.objectToJson(tv);
+        log.info("COST_TO_PAY_API 支付单信息:{} 数据：{}",verificationSubject.getVerificationSubCode(),json);
+        String rs = HttpUtil.doPost(COST_TO_PAY_API,json,null);
+        log.info("COST_TO_PAY_API 支付单信息：{},结果：{}",verificationSubject.getVerificationSubCode(),rs);
         //保存支付
-        PayPayment payPayment = new PayPayment();
+//        PayPayment payPayment = new PayPayment();
-        payPayment.setPayType(PaymentType.PAYMENT);
+//        payPayment.setPayType(PaymentType.PAYMENT);
-        payPayment.setPayCode("PM"+ StringUtils.genShortId());
+//        payPayment.setPayCode("PM"+ StringUtils.genShortId());
-        payPayment.setSupplierId(supplierId);
+//        payPayment.setSupplierId(supplierId);
-        payPayment.setSupplierCode(supplier.getCode());
+//        payPayment.setSupplierCode(supplier.getCode());
-        payPayment.setSupplierName(supplier.getName());
+//        payPayment.setSupplierName(supplier.getName());
-        payPayment.setPayAmount(totalAmount);
+//        payPayment.setPayAmount(totalAmount);
-        payPayment.setUserId(user.getId());
+//        payPayment.setUserId(user.getId());
-        payPayment.setUserCode(user.getCode());
+//        payPayment.setUserCode(user.getCode());
-        payPayment.setUserName(user.getName());
+//        payPayment.setUserName(user.getName());
-        payPayment.setPayTime(nowTime);
+//        payPayment.setPayTime(nowTime);
-        payPayment.setErpCode(erpCode);
+//        payPayment.setErpCode(erpCode);
-        payPayment.setBillNumber(billNumber);
+//        payPayment.setBillNumber(billNumber);
-        paymentService.save(payPayment);
+//        paymentService.save(payPayment);
-
+//
-        PayPaymentItem paymentItem = new PayPaymentItem();
+//        PayPaymentItem paymentItem = new PayPaymentItem();
-        paymentItem.setPaymentId(payPayment.getId());
+//        paymentItem.setPaymentId(payPayment.getId());
-        paymentItem.setPayType(PaymentType.PAYMENT);
+//        paymentItem.setPayType(PaymentType.PAYMENT);
-        paymentItem.setSupplierId(supplierId);
+//        paymentItem.setSupplierId(supplierId);
-        paymentItem.setItemPayAmount(totalAmount);
+//        paymentItem.setItemPayAmount(totalAmount);
-        paymentItem.setVerificationId(verification.getId());
+//        paymentItem.setVerificationId(verification.getId());
-        paymentItem.setVerificationSubjectId(verificationSubject.getId());
+//        paymentItem.setVerificationSubjectId(verificationSubject.getId());
-        paymentItem.setCostApplyId(costApply.getId());
+//        paymentItem.setCostApplyId(costApply.getId());
-        paymentItem.setActivityId(activity.getId());
+//        paymentItem.setActivityId(activity.getId());
-        paymentItem.setActivityCode(activity.getActivityCode());
+//        paymentItem.setActivityCode(activity.getActivityCode());
-        paymentItem.setSubjectId(subject.getId());
+//        paymentItem.setSubjectId(subject.getId());
-        paymentItem.setSubjectCode(subject.getSubjectCode());
+//        paymentItem.setSubjectCode(subject.getSubjectCode());
-        paymentItem.setSubjectName(subject.getSubjectName());
+//        paymentItem.setSubjectName(subject.getSubjectName());
-        paymentItemService.save(paymentItem);
+//        paymentItemService.save(paymentItem);
 
     }
 

src/main/java/com/qs/serve/task/controller/TaskActivityController.java

@@ -7,7 +7,9 @@ import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
 import com.qs.serve.modules.bir.service.BirBaseActivityService;
+import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
+import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
@@ -32,13 +34,14 @@ import java.util.List;
 @AllArgsConstructor
 @RestController
 @RequestMapping("/task/activity")
-@ConditionalOnProperty(value = "project.task", havingValue = "true")
+//@ConditionalOnProperty(value = "project.task", havingValue = "true")
 public class TaskActivityController {
 
     private final TbsActivityService activityService;
     private final TbsActivityTemplateService activityTemplateService;
     private final BirBaseActivityService birBaseActivityService;
     private final BirActivityCenterGoodsService birActivityCenterGoodsService;
+    private final SeeYonRequestBaseService seeYonRequestBaseService;
 
 
     /**
@@ -65,7 +68,7 @@ public class TaskActivityController {
      */
     @GetMapping("syncDispatch")
     public R task0(){
-        //todo
+        seeYonRequestBaseService.getBase(TbsSeeYonConst.TASK_SYNC_DISPATCH,"同步ERP的发货单");
         return R.ok();
     }