aike/emis-oms2c-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-07-31 07:04:54 +08:00
parent 3752441032
commit fb397d46da
6 changed files with 117 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
View File

@ -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<Map> list = emisWaybillService.selectUserBindSalesmenList(searchValue);
List<Map> 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

28
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java Normal file
View File

@ -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;
}

18
emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
View File

@ -40,7 +40,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
* @param searchValue
* @return
*/
public List<Map> selectUserBindSalesmenList(@Param("customerCode") String customerCode,@Param("searchValue")String searchValue);
public List<Map> selectUserBindSalesmenList(@Param("customerCode") String customerCode,
@Param("searchValue")String searchValue,
@Param("defaultFlag")String defaultFlag);
/**
@ -57,8 +59,8 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
* @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<EmisWaybill>
* @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<EmisWaybill>
* @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);
}

7
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
View File

@ -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<EmisWaybill> selectUserOrderList(EmisWaybill emisWaybill);
public List<Map> selectUserBindSalesmenList(String searchValue);
public List<Map> selectUserBindSalesmenList(Salesmen salesmen);
public int bindSalesmen(String empCode) throws EmisBizError;
public List<Map> queryNewSalesmen(String searchValue);
public int setDefaultBindSalesmen(String empCode,String defaultFlag);
public int deleteBindSalesmen(String empCode);
}

40
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
View File

@ -72,9 +72,13 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
* @return 运单列表
*/
@Override
public List<Map> selectUserBindSalesmenList(String searchValue)
public List<Map> 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;
}

5
emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -557,6 +557,9 @@
<if test="searchValue != null and searchValue != ''">
and b.emp_name like concat('%', #{searchValue}, '%')
</if>
<if test="defaultFlag != null and defaultFlag != ''">
and b.default_flag=#{defaultFlag}
</if>
</select>
<select id="queryNewSalesmen" resultType="map">
@ -590,7 +593,7 @@
</delete>
<delete id="setBindSalesmenDefault" parameterType="String">
update sys_oms_user_bind_emp set default_flag='1' where customer_code=#{customerCode} and emp_code=#{empCode}
update sys_oms_user_bind_emp set default_flag=#{defaultFlag} where customer_code=#{customerCode} and emp_code=#{empCode}
</delete>
<delete id="deleteBindSalesmen" parameterType="String">