From 635bdcd1ffa93cd4f595b5bd1a99a561d88ab325 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 8 Sep 2023 17:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=B0=83=E5=BA=A6=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=EF=BC=8C=E5=85=BC=E5=AE=B9=E6=97=A7=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/sys/entity/SysSyncLog.java | 1 + .../modules/sys/entity/SysUserCodeMath.java | 89 +++++++++++++++++++ .../sys/mapper/SysUserCodeMathMapper.java | 22 +++++ .../modules/tbs/common/TbsSeeYonConst.java | 2 + .../modules/third/PortalOfCostController.java | 1 + .../service/PortalOfCostApplication.java | 13 ++- .../controller/TaskActivityController.java | 7 +- 7 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/sys/entity/SysUserCodeMath.java create mode 100644 src/main/java/com/qs/serve/modules/sys/mapper/SysUserCodeMathMapper.java diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java b/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java index 07dfcd03..a6d56fb9 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java +++ b/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; /** 请求地址 */ diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUserCodeMath.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUserCodeMath.java new file mode 100644 index 00000000..eb2543aa --- /dev/null +++ b/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; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/sys/mapper/SysUserCodeMathMapper.java b/src/main/java/com/qs/serve/modules/sys/mapper/SysUserCodeMathMapper.java new file mode 100644 index 00000000..8600d888 --- /dev/null +++ b/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 { + + + @InterceptorIgnore(tenantLine = "true") + @Select("select `curr_code` from sys_user_code_math where sour_code = #{oldCode} limit 1 ") + String getNewCode(@Param("oldCode") String oldCode); + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 3a8406e1..9384a6fc 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/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"; diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index ec4cb883..dba062c7 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/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(); diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index 2d3af049..110ccf76 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/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 unMatchBudgetItem = budgetCostResult.getBudgetUnMatchList(); + if(unMatchBudgetItem.size()>0){ + Assert.throwEx("未能匹配到预算"); + } List costUnItemList = new ArrayList<>(); if(CollectionUtil.isNotEmpty(unMatchBudgetItem)){ for (TbsBudgetCostItem budgetCostItem : unMatchBudgetItem) { @@ -729,7 +741,6 @@ public class PortalOfCostApplication { } costUnItemService.saveBatch(costUnItemList); - //TODO 修改预算日志，记录政策使用情况 //匹配的商品，生成预算日志 List matchBudgetItem = budgetCostResult.getBudgetMatchList(); List budgetLogList = new ArrayList<>(); diff --git a/src/main/java/com/qs/serve/task/controller/TaskActivityController.java b/src/main/java/com/qs/serve/task/controller/TaskActivityController.java index 5e6ade50..4896fef4 100644 --- a/src/main/java/com/qs/serve/task/controller/TaskActivityController.java +++ b/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(); }