aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-06 20:16:26 +08:00
parent fd3a8b8f87
commit 50da2cb7dd
8 changed files with 583 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesmenRelController.java Normal file
View File

@ -0,0 +1,134 @@
/**
* @Project: emis
* @Title: EmisSalesmenRelController.java
* @author linfso
* @date 2024-08-06 10:34:21
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 销售人员关联表 控制器 </p>
*/
package com.xdadan.erp.web.emis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.xdadan.erp.common.annotation.Log;
import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisSalesmenRel;
import com.xdadan.erp.emis.service.IEmisSalesmenRelService;
/**
* 销售人员关联表Controller
*
* @author linfso
* @date 2024-08-06 10:34:21
*/
@RestController
@RequestMapping("/emis/emisSalesmenRel")
public class EmisSalesmenRelController extends BaseController
{
@Autowired
private IEmisSalesmenRelService emisSalesmenRelService;
/**
* 查询销售人员关联表列表
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:list')")
@GetMapping("/list")
public TableDataInfo list(EmisSalesmenRel emisSalesmenRel)
{
startPage();
List<EmisSalesmenRel> list = emisSalesmenRelService.selectEmisSalesmenRelList(emisSalesmenRel);
return getDataTable(list);
}
/**
* 检查是否重复
*
* @param emisSalesmenRel
* @return 数量
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:list')")
@GetMapping("/checkUnique")
public AjaxResult checkUnique(EmisSalesmenRel emisSalesmenRel)
{
int cnt=emisSalesmenRelService.checkUnique(emisSalesmenRel);
return AjaxResult.success("检查成功",cnt);
}
/**
* 导出销售人员关联表列表
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:export')")
@Log(title = "销售人员关联表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EmisSalesmenRel emisSalesmenRel)
{
List<EmisSalesmenRel> list = emisSalesmenRelService.selectEmisSalesmenRelList(emisSalesmenRel);
ExcelUtil<EmisSalesmenRel> util = new ExcelUtil<EmisSalesmenRel>(EmisSalesmenRel.class);
util.exportExcel(response, list, "销售人员关联表数据");
}
/**
* 获取销售人员关联表详细信息
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(emisSalesmenRelService.selectEmisSalesmenRelById(id));
}
/**
* 新增销售人员关联表
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:add')")
@Log(title = "销售人员关联表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody EmisSalesmenRel emisSalesmenRel)
{
return toAjax(emisSalesmenRelService.insertEmisSalesmenRel(emisSalesmenRel));
}
/**
* 修改销售人员关联表
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:edit')")
@Log(title = "销售人员关联表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EmisSalesmenRel emisSalesmenRel)
{
return toAjax(emisSalesmenRelService.updateEmisSalesmenRel(emisSalesmenRel));
}
/**
* 删除销售人员关联表
*/
@PreAuthorize("@ss.hasPermi('emis:emisSalesmenRel:remove')")
@Log(title = "销售人员关联表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(emisSalesmenRelService.deleteEmisSalesmenRelByIds(ids));
}
}

43
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java Normal file
View File

@ -0,0 +1,43 @@
/**
* @Project: emis
* @Title: EmisSalesmenRel.java
* @author linfso
* @date 2024-08-06 10:34:21
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 销售人员关联表 实体类 </p>
*/
package com.xdadan.erp.emis.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xdadan.erp.common.annotation.Excel;
import com.xdadan.erp.common.core.domain.BaseEntity;
import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* @ClassName EmisSalesmenRel
* @Description 销售人员关联表
* @author linfso
* @date 2024-08-06 10:34:21
*/
@Data
public class EmisSalesmenRel extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 销售联系人 */
private String salesmen;
/* 销售助理 */
private String salesAss;
}

80
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java Normal file
View File

@ -0,0 +1,80 @@
/**
* @Project: emis
* @Title: EmisSalesmenRelMapper.java
* @author linfso
* @date 2024-08-06 10:34:21
* @Copyright: ShangHai Doitinfo 2022 All rights reserved.
* @version v1.0
* @Description: <p> 销售人员关联表 Mapper 接口 </p>
* <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
*/
package com.xdadan.erp.emis.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisSalesmenRel;
/**
* @ClassName EmisSalesmenRelMapper
* @Description <p> 销售人员关联表 Mapper 接口 </p>
* @author linfso
* @date 2024-08-06 10:34:21
*/
public interface EmisSalesmenRelMapper extends BaseMapper<EmisSalesmenRel>
{
/**
* 主键查询
* @param id
* @return
*/
public EmisSalesmenRel selectEmisSalesmenRelById(Long id);
/**
* 查询列表
*
* @param emisSalesmenRel
* @return 集合
*/
public List<EmisSalesmenRel> selectEmisSalesmenRelList(EmisSalesmenRel emisSalesmenRel);
/**
* 检查是否重复
*
* @param emisSalesmenRel
* @return 数量
*/
public int checkUnique(EmisSalesmenRel emisSalesmenRel);
/**
* 新增
*
* @param emisSalesmenRel
* @return
*/
public int insertEmisSalesmenRel(EmisSalesmenRel emisSalesmenRel);
/**
* 修改
*
* @param emisSalesmenRel
* @return
*/
public int updateEmisSalesmenRel(EmisSalesmenRel emisSalesmenRel);
/**
* 删除
*
* @param id 主键
* @return 结果
*/
public int deleteEmisSalesmenRelById(Long id);
/**
* 批量删除
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmisSalesmenRelByIds(Long[] ids);
}

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -861,8 +861,18 @@ public class EmisBaseService {
List<EmisTmsTransferTrace> list = emisTmsTransferTraceMapper.selectEmisTmsTransferTraceList(emisTmsTransferTrace);
if(!CollectionUtil.isEmpty(list)){
for(EmisTmsTransferTrace dt:list){
// 获取收件人手机号
EmisWaybill emisWaybill=getWaybillByBillCode(dt.getBillCode());
String phone="1234";
if(emisWaybill==null){
continue;
}
phone=emisWaybill.getReceiveMobile();
log.error("===>Start 三方物流跟踪单号:"+dt.getBillCode()+","+dt.getTransferExpress()+" "+dt.getTransferBillCode());
EmisTmsTransferTrace rstUpd=Kd100Helper.queryTmsTransferTraceByKd100(dt);
EmisTmsTransferTrace rstUpd=Kd100Helper.queryTmsTransferTraceByKd100(dt,phone);
// 如果已签收，需要做签收扫描
if(WaybillStatus.SIGNED.statusCode.equals(rstUpd.getLastWaybillStatus())){
// 查询转件的站点

78
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java Normal file
View File

@ -0,0 +1,78 @@
/**
* @Project: emis
* @Title: EmisSalesmenRelService.java
* @author linfso
* @date 2024-08-06 10:34:21
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 销售人员关联表 服务类接口 </p>
*/
package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisSalesmenRel;
/**
* @ClassName EmisSalesmenRelService
* @Description 销售人员关联表
* @author linfso
* @date 2024-08-06 10:34:21
*/
public interface IEmisSalesmenRelService
{
/**
* 主键查询
* @param id
* @return
*/
public EmisSalesmenRel selectEmisSalesmenRelById(Long id);
/**
* 查询销售人员关联表列表
*
* @param emisSalesmenRel 销售人员关联表
* @return 销售人员关联表集合
*/
public List<EmisSalesmenRel> selectEmisSalesmenRelList(EmisSalesmenRel emisSalesmenRel);
/**
* 检查是否重复
*
* @param emisSalesmenRel
* @return 数量
*/
public int checkUnique(EmisSalesmenRel emisSalesmenRel);
/**
* 新增销售人员关联表
*
* @param emisSalesmenRel 销售人员关联表
* @return 结果
*/
public int insertEmisSalesmenRel(EmisSalesmenRel emisSalesmenRel);
/**
* 修改销售人员关联表
*
* @param emisSalesmenRel 销售人员关联表
* @return 结果
*/
public int updateEmisSalesmenRel(EmisSalesmenRel emisSalesmenRel);
/**
* 批量删除销售人员关联表
*
* @param ids 需要删除的销售人员关联表主键集合
* @return 结果
*/
public int deleteEmisSalesmenRelByIds(Long[] ids);
/**
* 删除销售人员关联表信息
*
* @param id 销售人员关联表主键
* @return 结果
*/
public int deleteEmisSalesmenRelById(Long id);
}

117
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java Normal file
View File

@ -0,0 +1,117 @@
/**
* @Project: emis
* @Title: EmisSalesmenRelServiceImpl.java
* @author linfso
* @date 2024-08-06 10:34:21
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 销售人员关联表 实体类 </p>
*/
package com.xdadan.erp.emis.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisSalesmenRel;
import com.xdadan.erp.emis.mapper.EmisSalesmenRelMapper;
import com.xdadan.erp.emis.service.IEmisSalesmenRelService;
/**
* 销售人员关联表Service业务层处理
*
* @author linfso
* @date 2024-08-06 10:34:21
*/
@Service
public class EmisSalesmenRelServiceImpl implements IEmisSalesmenRelService
{
@Autowired
private EmisSalesmenRelMapper emisSalesmenRelMapper;
/**
* 查询销售人员关联表
*
* @param id 销售人员关联表主键
* @return 销售人员关联表
*/
@Override
public EmisSalesmenRel selectEmisSalesmenRelById(Long id)
{
return emisSalesmenRelMapper.selectEmisSalesmenRelById(id);
}
/**
* 查询销售人员关联表列表
*
* @param emisSalesmenRel 销售人员关联表
* @return 销售人员关联表
*/
@Override
public List<EmisSalesmenRel> selectEmisSalesmenRelList(EmisSalesmenRel emisSalesmenRel)
{
return emisSalesmenRelMapper.selectEmisSalesmenRelList(emisSalesmenRel);
}
/**
* 检查是否重复
*
* @param emisSalesmenRel
* @return 数量
*/
@Override
public int checkUnique(EmisSalesmenRel emisSalesmenRel)
{
return emisSalesmenRelMapper.checkUnique(emisSalesmenRel);
}
/**
* 新增销售人员关联表
*
* @param emisSalesmenRel 销售人员关联表
* @return 结果
*/
@Override
public int insertEmisSalesmenRel(EmisSalesmenRel emisSalesmenRel)
{
return emisSalesmenRelMapper.insertEmisSalesmenRel(emisSalesmenRel);
}
/**
* 修改销售人员关联表
*
* @param emisSalesmenRel 销售人员关联表
* @return 结果
*/
@Override
public int updateEmisSalesmenRel(EmisSalesmenRel emisSalesmenRel)
{
return emisSalesmenRelMapper.updateEmisSalesmenRel(emisSalesmenRel);
}
/**
* 批量删除销售人员关联表
*
* @param ids 需要删除的销售人员关联表主键
* @return 结果
*/
@Override
public int deleteEmisSalesmenRelByIds(Long[] ids)
{
return emisSalesmenRelMapper.deleteEmisSalesmenRelByIds(ids);
}
/**
* 删除销售人员关联表信息
*
* @param id 销售人员关联表主键
* @return 结果
*/
@Override
public int deleteEmisSalesmenRelById(Long id)
{
return emisSalesmenRelMapper.deleteEmisSalesmenRelById(id);
}
}

8
emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
View File

@ -38,12 +38,12 @@ public class Kd100Helper {
* @param num 快递单号
* @return data
*/
public static String queryTraceByMainNoAndCom(String mainNo, String com) throws Exception {
public static String queryTraceByMainNoAndCom(String mainNo, String com,String phone) throws Exception {
Map<String, String> param = new HashMap<>();
param.put("com", com);//快递公司编码
param.put("num", mainNo);//快递单号
param.put("phone", "1234");
param.put("phone", phone);
param.put("from", "");
param.put("to", "");
param.put("show", "0");
@ -88,12 +88,12 @@ public class Kd100Helper {
return recordList;
}
public static EmisTmsTransferTrace queryTmsTransferTraceByKd100(EmisTmsTransferTrace emisTmsTransferTrace) {
public static EmisTmsTransferTrace queryTmsTransferTraceByKd100(EmisTmsTransferTrace emisTmsTransferTrace,String phone) {
String rstStr= null;
try {
emisTmsTransferTrace.setChId("KD100");
rstStr = queryTraceByMainNoAndCom(emisTmsTransferTrace.getTransferBillCode(),emisTmsTransferTrace.getTransferExpress());
rstStr = queryTraceByMainNoAndCom(emisTmsTransferTrace.getTransferBillCode(),emisTmsTransferTrace.getTransferExpress(),phone);
JSONObject jsonObject=JSONObject.parseObject(rstStr);
emisTmsTransferTrace.setTraceInfo(rstStr);
/*

116
emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml Normal file
View File

@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisSalesmenRelMapper">
<resultMap type="EmisSalesmenRel" id="EmisSalesmenRelResult">
<result property="id" column="id" />
<result property="salesmen" column="salesmen" />
<result property="salesAss" column="sales_ass" />
</resultMap>
<sql id="selectEmisSalesmenRelVo">
select id, salesmen, sales_ass, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_salesmen_rel
</sql>
<select id="selectEmisSalesmenRelList" parameterType="EmisSalesmenRel" resultMap="EmisSalesmenRelResult">
<include refid="selectEmisSalesmenRelVo"/>
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="salesmen != null and salesmen != ''"> and salesmen = #{salesmen}</if>
<if test="salesAss != null and salesAss != ''"> and sales_ass = #{salesAss}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
</where>
order by create_time desc
</select>
<select id="checkUnique" parameterType="EmisSalesmenRel" resultType="int">
select count(1) from emis_salesmen_rel
where del_flag='0'
and id = #{id}
and salesmen = #{salesmen}
and sales_ass = #{salesAss}
and remark = #{remark}
and del_flag = #{delFlag}
and create_by = #{createBy}
and create_time = #{createTime}
and update_by = #{updateBy}
and update_time = #{updateTime}
and create_site = #{createSite}
and update_site = #{updateSite}
limit 1
</select>
<select id="selectEmisSalesmenRelById" parameterType="Long" resultMap="EmisSalesmenRelResult">
select id, salesmen, sales_ass, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_salesmen_rel a
where a.id = #{id}
</select>
<insert id="insertEmisSalesmenRel" parameterType="EmisSalesmenRel" useGeneratedKeys="true" keyProperty="id">
insert into emis_salesmen_rel
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="salesmen != null and salesmen != ''">salesmen,</if>
<if test="salesAss != null and salesAss != ''">sales_ass,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="salesmen != null and salesmen != ''">#{salesmen},</if>
<if test="salesAss != null and salesAss != ''">#{salesAss},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</insert>
<update id="updateEmisSalesmenRel" parameterType="EmisSalesmenRel">
update emis_salesmen_rel
<trim prefix="SET" suffixOverrides=",">
<if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
<if test="salesAss != null and salesAss != ''">sales_ass = #{salesAss},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEmisSalesmenRelById" parameterType="Long">
delete from emis_salesmen_rel where id = #{id}
</delete>
<delete id="deleteEmisSalesmenRelByIds" parameterType="String">
delete from emis_salesmen_rel where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>