对接调度系统，兼容旧用户编码

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/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/service/PortalOfCostApplication.java

@@ -24,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;
@@ -66,6 +67,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class PortalOfCostApplication {
 
+    private SysUserCodeMathMapper userCodeMathMapper;
+
     private TbsActivityService activityService;
     private TbsActivityCenterService activityCenterService;
     private TbsActivitySubjectService activitySubjectService;
@@ -524,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("客户不存在，请重新编辑");}
@@ -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<>();

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();
     }