From 7b87b2e8506983c8dcae842ece4d1d9dec24244f Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 16 十月 2023 09:03:00 +0800
Subject: [PATCH] 1
---
server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
index 7c6e23d..65607da 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
@@ -416,6 +416,7 @@
wTransferDetail.setTransferId(wTransfer.getId());
wTransferDetail.setOutDepartId(wTransfer.getOutDepartId());
wTransferDetail.setOutWarehouseId(wTransfer.getOutWarehouseId());
+ wTransferDetail.setOutLocationId(w.getOutLocationId());
wTransferDetail.setInDepartId(wTransfer.getInDepartId());
wTransferDetail.setInWarehouseId(wTransfer.getInWarehouseId());
wTransferDetail.setInLcoationId(w.getInLocationId());
@@ -469,6 +470,7 @@
throw new BusinessException(ResponseStatus.OBJECT_EMP.getCode(), "鏈煡璇㈠埌杞簱鍗曠被鍨嬩俊鎭��"+wTransfer.getType()+"銆�");
}
+
sendOutNotice(companyUser.getId(),wTransfer.getId(),wTransfer.getCode(),notices_type_transfer,Constants.getNoticeUrl(loginUserInfo.getCompany(),Constants.DINGDING_NOTICE_URL.out));
//璁板綍鎿嶄綔璁板綍
@@ -480,6 +482,7 @@
public void sendOutNotice(Integer userId ,Integer billId , String billCode ,Constants.Notices_Type_Transfer notices_type_transfer,String url){
+
//鍙戦�侀�氱煡
Notices notices = new Notices();
notices.setCompanyUserId(userId);
@@ -487,10 +490,13 @@
notices.setContent("銆�"+billCode+"銆�"+ notices_type_transfer.getContent().replace("{optType}","鍑哄簱"));
notices.setTitle(notices_type_transfer.getTitle());
notices.setObjId(billId);
- notices.setUrl(url.replace("{id}",billId.toString()));
+ if(!Objects.isNull(url)){
+ notices.setUrl(url.replace("{id}",billId.toString()));
+ }
noticesExtService.sendNotice(notices);
}
public void sendOutNotice(LoginUserInfo user,Integer userId ,Integer billId , String billCode ,Constants.Notices_Type_Transfer notices_type_transfer,String url){
+
//鍙戦�侀�氱煡
Notices notices = new Notices();
notices.setCompanyUserId(userId);
@@ -498,11 +504,14 @@
notices.setContent("銆�"+billCode+"銆�"+ notices_type_transfer.getContent().replace("{optType}","鍑哄簱"));
notices.setTitle(notices_type_transfer.getTitle());
notices.setObjId(billId);
- notices.setUrl(url.replace("{id}",billId.toString()));
+ if(!Objects.isNull(url)){
+ notices.setUrl(url.replace("{id}",billId.toString()));
+ }
noticesExtService.sendNoticeNologin(notices,user);
}
public void sendInNotice(Integer userId ,Integer billId , String billCode ,Constants.Notices_Type_Transfer notices_type_transfer,String url){
+
//鍙戦�侀�氱煡
Notices notices = new Notices();
notices.setCompanyUserId(userId);
@@ -510,7 +519,9 @@
notices.setContent("銆�"+billCode+"銆�"+ notices_type_transfer.getContent().replace("{optType}","鍏ュ簱"));
notices.setTitle(notices_type_transfer.getTitle());
notices.setObjId(billId);
- notices.setUrl(url.replace("{id}",billId.toString()));
+ if(!Objects.isNull(url)){
+ notices.setUrl(url.replace("{id}",billId.toString()));
+ }
noticesExtService.sendNotice(notices);
}
--
Gitblit v1.9.3