From fb397d46da389aacf64d3a01c43012ee6eb560d9 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 31 Jul 2024 07:04:54 +0800 Subject: [PATCH] md --- .../erp/oms/web/Oms2cWaybillController.java | 57 +++++++++++-------- .../xdadan/erp/oms/domain/vo/Salesmen.java | 28 +++++++++ .../erp/oms/mapper/EmisWaybillMapper.java | 18 ++++-- .../erp/oms/service/IEmisWaybillService.java | 7 ++- .../service/impl/EmisWaybillServiceImpl.java | 40 +++++++++++-- .../resources/mapper/EmisWaybillMapper.xml | 5 +- 6 files changed, 117 insertions(+), 38 deletions(-) create mode 100644 emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index dcd8d56..6d2392a 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -25,6 +25,7 @@ import com.xdadan.erp.oms.common.utils.DateUtils; import com.xdadan.erp.oms.common.utils.HTTPHelperV3; import com.xdadan.erp.oms.common.utils.VerifyCodeUtil; import com.xdadan.erp.oms.common.utils.spring.SpringUtils; +import com.xdadan.erp.oms.domain.EmisCustomerAddress; import com.xdadan.erp.oms.domain.EmisEmailSendRecord; import com.xdadan.erp.oms.domain.EmisMonthpayUseApply; import com.xdadan.erp.oms.domain.enumtype.EmisBizErrorType; @@ -218,14 +219,30 @@ public class Oms2cWaybillController extends BaseController return getDataTable(list); } + @GetMapping("/listWmsWarehouse") + public AjaxResult listWmsWarehouse(Integer pageNum,Integer pageSize,String searchValue) + { +// @RequestBody WmsWarehouse wmsWarehouse, +// WmsWarehouse wmsWarehouse = new WmsWarehouse(); +// wmsWarehouse.setSearchValue(searchValue); + if(pageNum==null){ + pageNum=1; + } + + if(pageSize==null){ + pageNum=10; + } + return iRpcWmsWarehouseSvc.listWmsWarehouse(searchValue,pageNum,pageSize); + } + /** * 获取绑定业务员 - * @param searchValue + * @param salesmen * @return */ @GetMapping("/listBindSalesmen") - public TableDataInfo listBindSalesmen(String searchValue,String blDefaultFlag) + public TableDataInfo listBindSalesmen(Salesmen salesmen) { startPage(); // "empCode": "业务员编码", @@ -236,11 +253,13 @@ public class Oms2cWaybillController extends BaseController // "ownerSiteCode":"所属网点编号", // "ownerSiteName":"所属网点名称", - List list = emisWaybillService.selectUserBindSalesmenList(searchValue); + List list = emisWaybillService.selectUserBindSalesmenList(salesmen); return getDataTable(list); } + + @GetMapping("/queryNewSalesmen") public AjaxResult queryNewSalesmen(String searchValue) { @@ -258,27 +277,6 @@ public class Oms2cWaybillController extends BaseController return AjaxResult.success("获取成功",empList); } - - - - @GetMapping("/listWmsWarehouse") - public AjaxResult listWmsWarehouse(Integer pageNum,Integer pageSize,String searchValue) - { -// @RequestBody WmsWarehouse wmsWarehouse, -// WmsWarehouse wmsWarehouse = new WmsWarehouse(); -// wmsWarehouse.setSearchValue(searchValue); - if(pageNum==null){ - pageNum=1; - } - - if(pageSize==null){ - pageNum=10; - } - return iRpcWmsWarehouseSvc.listWmsWarehouse(searchValue,pageNum,pageSize); - } - - - /** * 绑定业务员 * @param empCode @@ -302,6 +300,17 @@ public class Oms2cWaybillController extends BaseController } + @PostMapping("/setDefaultBindSalesmen") + public AjaxResult setDefaultBindSalesmen(Salesmen salemen) + { +// EmisCustomerAddress emisCustomerAddress=emisCustomerAddressService.selectEmisCustomerAddressById(id); +// if(!getLoginUser().getUser().getCustomerCode().equals(emisCustomerAddress.getCustomerCode())){ +// return AjaxResult.error("非法操作"); +// } + + return toAjax(emisWaybillService.setDefaultBindSalesmen(salemen.getEmpCode(),salemen.getBlDefaultFlag())); + } + /** * 绑定月结卡号 * @param monthPayCode diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java new file mode 100644 index 0000000..9bb613d --- /dev/null +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java @@ -0,0 +1,28 @@ +package com.xdadan.erp.oms.domain.vo; + +import com.xdadan.erp.oms.common.core.domain.BaseEntity; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class Salesmen extends BaseEntity { + +// "empCode": "业务员编码", +// "empName": "业务员名称", +// "rate": "3", +// "avater": "http://123213", +// "phone":"联系电话", +// "ownerSiteCode":"所属网点编号", +// "ownerSiteName":"所属网点名称", + + private String empCode; + private String empName; + private String rate; + private String avater; + private String phone; + private String ownerSiteCode; + private String ownerSiteName; + private String defaultFlag; +} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java index e3c20e4..40524e4 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java @@ -40,7 +40,9 @@ public interface EmisWaybillMapper extends BaseMapper * @param searchValue * @return */ - public List selectUserBindSalesmenList(@Param("customerCode") String customerCode,@Param("searchValue")String searchValue); + public List selectUserBindSalesmenList(@Param("customerCode") String customerCode, + @Param("searchValue")String searchValue, + @Param("defaultFlag")String defaultFlag); /** @@ -57,8 +59,8 @@ public interface EmisWaybillMapper extends BaseMapper * @param empCode * @return */ - public int insertBindSalesmen(@Param("customerCode") String customerCode,@Param("empCode") String empCode); - + public int insertBindSalesmen(@Param("customerCode") String customerCode, + @Param("empCode") String empCode); /** @@ -67,7 +69,8 @@ public interface EmisWaybillMapper extends BaseMapper * @param empCode * @return */ - public int checkIsBindSalesmen(@Param("customerCode") String customerCode,@Param("empCode") String empCode); + public int checkIsBindSalesmen(@Param("customerCode") String customerCode, + @Param("empCode") String empCode); /** @@ -89,8 +92,11 @@ public interface EmisWaybillMapper extends BaseMapper * @param empCode * @return */ - public int deleteBindSalesmen(@Param("customerCode") String customerCode,@Param("empCode") String empCode); + public int deleteBindSalesmen(@Param("customerCode") String customerCode, + @Param("empCode") String empCode); - public int setBindSalesmenDefault(@Param("customerCode") String customerCode,@Param("empCode") String empCode); + public int setBindSalesmenDefault(@Param("customerCode") String customerCode, + @Param("empCode") String empCode, + @Param("defaultFlag")String defaultFlag); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java index 74686a6..ef85ed0 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java @@ -14,6 +14,7 @@ import java.util.Map; import com.xdadan.erp.oms.domain.EmisWaybill; import com.xdadan.erp.oms.domain.exception.EmisBizError; +import com.xdadan.erp.oms.domain.vo.Salesmen; /** * @ClassName EmisWaybillService @@ -31,15 +32,15 @@ public interface IEmisWaybillService */ public List selectUserOrderList(EmisWaybill emisWaybill); - public List selectUserBindSalesmenList(String searchValue); + public List selectUserBindSalesmenList(Salesmen salesmen); public int bindSalesmen(String empCode) throws EmisBizError; - public List queryNewSalesmen(String searchValue); + public int setDefaultBindSalesmen(String empCode,String defaultFlag); - + public int deleteBindSalesmen(String empCode); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java index af47656..6a814dd 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java @@ -72,9 +72,13 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService * @return 运单列表 */ @Override - public List selectUserBindSalesmenList(String searchValue) + public List selectUserBindSalesmenList(Salesmen salesmen) { - return emisWaybillMapper.selectUserBindSalesmenList(SecurityUtils.getLoginUser().getUser().getCustomerCode(),searchValue); + return emisWaybillMapper.selectUserBindSalesmenList( + SecurityUtils.getLoginUser().getUser().getCustomerCode(), + salesmen.getSearchValue(), + salesmen.getDefaultFlag() + ); } @Override @@ -83,6 +87,34 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService return emisWaybillMapper.queryNewSalesmen(searchValue); } + @Override + public int setDefaultBindSalesmen(String empCode,String defaultFlag) + { + + String customerCode=SecurityUtils.getLoginUser().getUser().getCustomerCode(); + if("1".equals(defaultFlag)){ + + // 取消以前的默认 + emisWaybillMapper.cancelBindSalesmenDefault(customerCode); + // 设置当前为1 + emisWaybillMapper.setBindSalesmenDefault(customerCode,empCode,"1"); + } + else{ + // 设置当前 + emisWaybillMapper.setBindSalesmenDefault(customerCode,empCode,"0"); + } + + return 1; + + } + + @Override + public int deleteBindSalesmen(String empCode) + { + String customerCode=SecurityUtils.getLoginUser().getUser().getCustomerCode(); + return emisWaybillMapper.deleteBindSalesmen(customerCode,empCode); + } + @Override public int bindSalesmen(String empCode) throws EmisBizError { @@ -101,8 +133,8 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService // 取消全部默认 emisWaybillMapper.cancelBindSalesmenDefault(customerCode); - // 设置默认 - emisWaybillMapper.setBindSalesmenDefault(customerCode,empCode); + // 设置当前默认 + emisWaybillMapper.setBindSalesmenDefault(customerCode,empCode,"1"); return 1; } diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 8c3db48..17dd8dd 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -557,6 +557,9 @@ and b.emp_name like concat('%', #{searchValue}, '%') + + and b.default_flag=#{defaultFlag} +