diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesmenRelController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesmenRelController.java
new file mode 100644
index 000000000..455ee1b99
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesmenRelController.java
@@ -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:
销售人员关联表 控制器
+ */
+
+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 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 list = emisSalesmenRelService.selectEmisSalesmenRelList(emisSalesmenRel);
+ ExcelUtil util = new ExcelUtil(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));
+ }
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java
new file mode 100644
index 000000000..4e26ef335
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java
@@ -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: 销售人员关联表 实体类
+ */
+
+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;
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java
new file mode 100644
index 000000000..7316ab6ac
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java
@@ -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: 销售人员关联表 Mapper 接口
+ * Warning : This file is generate by ai tools,don't edit!!!
+ */
+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 销售人员关联表 Mapper 接口
+ * @author linfso
+ * @date 2024-08-06 10:34:21
+ */
+public interface EmisSalesmenRelMapper extends BaseMapper
+{
+ /**
+ * 主键查询
+ * @param id
+ * @return
+ */
+ public EmisSalesmenRel selectEmisSalesmenRelById(Long id);
+
+ /**
+ * 查询列表
+ *
+ * @param emisSalesmenRel
+ * @return 集合
+ */
+ public List 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);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index f8f417c26..1cf295d5f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -861,8 +861,18 @@ public class EmisBaseService {
List 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())){
// 查询转件的站点
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java
new file mode 100644
index 000000000..8a978733e
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java
@@ -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: 销售人员关联表 服务类接口
+ */
+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 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);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java
new file mode 100644
index 000000000..d80a1ebce
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java
@@ -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: 销售人员关联表 实体类
+ */
+
+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 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);
+ }
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
index c7c0004ac..fdeb20419 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
@@ -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 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);
/*
diff --git a/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml
new file mode 100644
index 000000000..fa6268ce9
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+ select id, salesmen, sales_ass, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_salesmen_rel
+
+
+
+
+
+
+
+
+
+ insert into emis_salesmen_rel
+
+ id,
+ salesmen,
+ sales_ass,
+ remark,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ create_site,
+ update_site,
+
+
+ #{id},
+ #{salesmen},
+ #{salesAss},
+ #{remark},
+ #{delFlag},
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+ #{createSite},
+ #{updateSite},
+
+
+
+
+ update emis_salesmen_rel
+
+ salesmen = #{salesmen},
+ sales_ass = #{salesAss},
+ remark = #{remark},
+ del_flag = #{delFlag},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+ create_site = #{createSite},
+ update_site = #{updateSite},
+
+ where id = #{id}
+
+
+
+ delete from emis_salesmen_rel where id = #{id}
+
+
+
+ delete from emis_salesmen_rel where id in
+
+ #{id}
+
+
+
\ No newline at end of file