From 04e167bce4cb2f93307890470bf517fa4867006d Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 10 Jan 2025 13:46:33 +0800 Subject: [PATCH] md --- .idea/encodings.xml | 3 - ...reyning_mybatisplus_plus_1_5_1_RELEASE.xml | 13 ++ backup/emis-wms-web/emis-wms-web.iml | 218 ++++++++++++++++++ backup/emis-wms/emis-wms.iml | 177 ++++++++++++++ emis-biz-web/emis-biz-web.iml | 1 + emis-biz/emis-biz.iml | 1 + .../erp/emis/service/EmisBaseService.java | 33 +++ .../service/impl/EmisWaybillServiceImpl.java | 25 +- .../resources/mapper/EmisSettleBillMapper.xml | 10 +- 9 files changed, 471 insertions(+), 10 deletions(-) create mode 100644 .idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml create mode 100644 backup/emis-wms-web/emis-wms-web.iml create mode 100644 backup/emis-wms/emis-wms.iml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 141ba3175..123a5844a 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -4,8 +4,5 @@ - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml b/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml new file mode 100644 index 000000000..7f215ce9c --- /dev/null +++ b/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/backup/emis-wms-web/emis-wms-web.iml b/backup/emis-wms-web/emis-wms-web.iml new file mode 100644 index 000000000..713a1d7c4 --- /dev/null +++ b/backup/emis-wms-web/emis-wms-web.iml @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backup/emis-wms/emis-wms.iml b/backup/emis-wms/emis-wms.iml new file mode 100644 index 000000000..7cd6e9981 --- /dev/null +++ b/backup/emis-wms/emis-wms.iml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml index 332c57fd9..2b5950271 100644 --- a/emis-biz-web/emis-biz-web.iml +++ b/emis-biz-web/emis-biz-web.iml @@ -57,6 +57,7 @@ + diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml index 9c01e055a..a55078f73 100644 --- a/emis-biz/emis-biz.iml +++ b/emis-biz/emis-biz.iml @@ -57,6 +57,7 @@ + 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 3cef2f5d4..7ceaecf62 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 @@ -24,6 +24,7 @@ package com.xdadan.erp.emis.service; import com.fasterxml.jackson.annotation.JsonFormat; import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.domain.entity.SysUser; + import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.core.redis.RedissonService; import com.xdadan.erp.common.utils.*; import com.xdadan.erp.common.utils.sign.MD5; @@ -47,6 +48,8 @@ package com.xdadan.erp.emis.service; import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.sensitive.Convert; import com.xdadan.erp.framework.manager.NoticManager; + import com.xdadan.erp.system.domain.SysPost; + import com.xdadan.erp.system.mapper.SysPostMapper; import com.xdadan.erp.system.mapper.SysUserMapper; import com.xdadan.erp.system.service.ISysConfigService; import com.xdadan.erp.system.service.ISysNoticeService; @@ -152,12 +155,17 @@ public class EmisBaseService { @Autowired private EmisSmsSendRecordMapper emisSmsSendRecordMapper; + @Autowired + private SysPostMapper sysPostMapper; + @Autowired private AliyunSMSService aliyunSMSService; @Autowired private Sms253Service sms253Service; + + private static SysUser emptySysUser = new SysUser(); @@ -437,6 +445,31 @@ public class EmisBaseService { } + /** + * 获取网点下的某个岗位的员工列表 + * @param ownerSiteCode + * @param postCode + * @return + */ + public List getSitePostStaffList(String ownerSiteCode,String postCode) + { + SysUser queryUser = new SysUser(); + Long[] postIds = null; + if(!StringUtils.isEmpty(postCode)) { + SysPost sysPost = new SysPost(); + sysPost.setPostCode(postCode); + List listPost = sysPostMapper.selectPostList(sysPost); + if(!CollectionUtil.isEmpty(listPost)) { + postIds = new Long[]{listPost.get(0).getPostId()}; + queryUser.setPostIds(postIds); + } + } + + queryUser.setOwnerSiteCode(ownerSiteCode); + queryUser.setBlOpen("1"); + + return userService.selectUserList(queryUser); + } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 173c24228..e6502b938 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -3124,21 +3124,42 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb title = title + " 客户昵称:" + emisCustomerUser.getNickName() + " 手机号:" + emisCustomerUser.getPhone(); } } - if("1".equals(emisWaybillSave.getPickupMethod())){ + if("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ){ userEmpCode=emisWaybillSave.getOperateEmployeeCode(); } else if("2".equals(emisWaybillSave.getPickupMethod())){ userEmpCode=emisWaybillSave.getTakePieceEmployeeCode(); } + // 通知销售联系人 + if(!StringUtils.isEmpty(emisWaybillSave.getSalesmen())){ + sendNoticeToSalemenUser(emisWaybillSave.getSalesmen(), title, title, "/d24/orderManagement/UserOrderList?billCode="+emisWaybillSave.getBillCode()); + } + // 通知取件员或者销售员 if(!StringUtils.isEmpty(userEmpCode)) { sendNoticeToEmpUser(userEmpCode, title, title, "/d24/orderManagement/UserOrderList?billCode="+emisWaybillSave.getBillCode()); } else{ - sendNoticeToSite(emisWaybillSave.getSendSiteCode(), title, title, "/d24/orderManagement/UserOrderList?billCode="+emisWaybillSave.getBillCode()); + List listEmpUser=null; + // 如果是上门取件，则通知取件员,如果是仓库收货则通知操作员 + if("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ) { + listEmpUser=getSitePostStaffList(emisWaybillSave.getSendSiteCode(),"OP"); + } + else if("2".equals(emisWaybillSave.getPickupMethod())){ + listEmpUser=getSitePostStaffList(emisWaybillSave.getSendSiteCode(),"RSD"); + } + + if(!CollectionUtils.isEmpty(listEmpUser)){ + for (SysUser itemUser:listEmpUser) { + sendNoticeToEmpUser(itemUser.getEmpCode(), title, title, "/d24/orderManagement/UserOrderList?billCode="+emisWaybillSave.getBillCode()); + } + } + } } + + /** * api 新开单 * @param emisWaybillSave diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 7eaacabb2..59920106b 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -299,11 +299,11 @@ and a.payment_status = #{paymentStatus} and ( - a.salesmen=#{params.privEmpName} - or a.payee=#{params.privEmpName} - or a.salesmen in( - select salesmen from emis_salesmen_rel esr where esr.del_flag='0' and esr.bl_open='1' and now() = ]]> esr.start_date and now() esr.end_date and esr.sales_ass=#{params.privEmpName} - ) + a.salesmen=#{params.privEmpName} + or a.payee=#{params.privEmpName} + or a.salesmen in( + select salesmen from emis_salesmen_rel esr where esr.del_flag='0' and esr.bl_open='1' and now() = ]]> esr.start_date and now() esr.end_date and esr.sales_ass=#{params.privEmpName} + ) )