weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_WMS20260401' into dev

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
#	mhd_oms/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-06-18 16:05:17 +08:00
parent eea6898404 229540a720
commit 4fbe36f949
12 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java
+1 -1
View File
@@ -557,7 +557,7 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
} }
@Override @Override
public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName) { public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName, String organization) {
} }
}; };
mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class BusinessDocumentOrderApplicationService {
public AjaxResult batchPushForOriginalImportExportDocument(List<Long> idList) { public AjaxResult batchPushForOriginalImportExportDocument(List<Long> idList) {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class BusinessPartnerApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class ErpCountryApplicationService{
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java
+1 -1
View File
@@ -116,7 +116,7 @@ public class ErpEnterpriseUnitApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
+8 -8
View File
@@ -95,7 +95,7 @@ public class ExchangeRateApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
@@ -133,7 +133,7 @@ public class ExchangeRateApplicationService {
gwLogMapper.insert(gwLog); gwLogMapper.insert(gwLog);
// 更新为推送中 // 更新为推送中
updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName); updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName, organizationId, organizationName);
CloseableHttpClient httpClient = HttpClients.createDefault(); CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(pushUrl); HttpPost httpPost = new HttpPost(pushUrl);
@@ -156,19 +156,19 @@ public class ExchangeRateApplicationService {
if (dataCode != null && dataCode == 200) { // 业务也成功 if (dataCode != null && dataCode == 200) { // 业务也成功
gwLog.setStatus(2); gwLog.setStatus(2);
updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName); updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName, organizationId, organizationName);
successCount++; successCount++;
} else { } else {
gwLog.setStatus(3); gwLog.setStatus(3);
gwLog.setErrorMsg(responseString); gwLog.setErrorMsg(responseString);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
failCount++; failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;"); failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
} }
} else { } else {
gwLog.setStatus(3); gwLog.setStatus(3);
gwLog.setErrorMsg(responseString); gwLog.setErrorMsg(responseString);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
failCount++; failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;"); failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
} }
@@ -179,7 +179,7 @@ public class ExchangeRateApplicationService {
gwLog.setErrorMsg(e.getMessage()); gwLog.setErrorMsg(e.getMessage());
gwLog.setResponseBody("请求异常：" + e.getMessage()); gwLog.setResponseBody("请求异常：" + e.getMessage());
gwLogMapper.updateById(gwLog); gwLogMapper.updateById(gwLog);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName); updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
failCount++; failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("异常:").append(e.getMessage()).append(";"); failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("异常:").append(e.getMessage()).append(";");
log.error("汇率推送异常: id={}, error={}", dto.getId(), e.getMessage()); log.error("汇率推送异常: id={}, error={}", dto.getId(), e.getMessage());
@@ -199,10 +199,10 @@ public class ExchangeRateApplicationService {
return AjaxResult.success(resultMsg); return AjaxResult.success(resultMsg);
} }
private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName) { private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName, Long organizationId, String organizationName) {
try { try {
String pushTimeStr = pushTime != null ? DateUtil.format(pushTime, "yyyy-MM-dd HH:mm:ss") : null; String pushTimeStr = pushTime != null ? DateUtil.format(pushTime, "yyyy-MM-dd HH:mm:ss") : null;
wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName); wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName, String.valueOf(organizationId));
} catch (Exception e) { } catch (Exception e) {
log.error("更新汇率推送状态失败: id={}, error={}", id, e.getMessage()); log.error("更新汇率推送状态失败: id={}, error={}", id, e.getMessage());
} }
mhd_oms/src/main/java/com/mhd/oms/application/service/gwLog/GwLogApplicationService.java
+2 -2
View File
@@ -56,8 +56,8 @@ public class GwLogApplicationService {
if(po1.isEmpty()){ if(po1.isEmpty()){
return null; return null;
} }
// 商业合作伙伴按组织隔离，只返回当前组织的报文 // 商业合作伙伴/企业币值(汇率管理)按组织隔离，只返回当前组织的报文
if ("商业合作伙伴".equals(gwLog.getType())) { if ("商业合作伙伴".equals(gwLog.getType()) || "汇率管理".equals(gwLog.getType())) {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null && loginUser.getUserPo() != null) { if (loginUser != null && loginUser.getUserPo() != null) {
Long orgId = loginUser.getUserPo().getOrganizationId(); Long orgId = loginUser.getUserPo().getOrganizationId();
mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class MaterialInfoApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+1 -1
View File
@@ -1975,7 +1975,7 @@ public class ReservationStockInOrderApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+2 -2
View File
@@ -1113,7 +1113,7 @@ public class ReservationStockOutOrderApplicationService {
idList.add(one.getOutOrderId()); idList.add(one.getOutOrderId());
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
@@ -1315,7 +1315,7 @@ public class ReservationStockOutOrderApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null; Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null; String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/exchangeRate/ExchangeRateDTO.java
+6
View File
@@ -16,4 +16,10 @@ public class ExchangeRateDTO {
@ApiModelProperty(value = "币种名称（ERP名称）") @ApiModelProperty(value = "币种名称（ERP名称）")
private String erpCurrName; private String erpCurrName;
@ApiModelProperty(value = "组织ID")
private Long organizationId;
@ApiModelProperty(value = "组织名称")
private String organizationName;
} }
mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+3 -3
View File
@@ -767,10 +767,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and CREATE_COMPANY_ID = #{createCompanyId} and CREATE_COMPANY_ID = #{createCompanyId}
</if> </if>
<if test="createStartTime != null"> <if test="createStartTime != null">
and CREATE_TIME &gt;= #{createStartTime} and o.CREATE_TIME &gt;= #{createStartTime}
</if> </if>
<if test="createEndTime != null"> <if test="createEndTime != null">
and CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400 and o.CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
</if> </if>
<!-- <if test="updateTime != null ">--> <!-- <if test="updateTime != null ">-->
@@ -1122,7 +1122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and SALESMAN_ID = #{salesmanId} and SALESMAN_ID = #{salesmanId}
</if> </if>
<if test="isDeclare != null "> <if test="isDeclare != null ">
and IS_DECLARE = #{isDeclare} and o.IS_DECLARE = #{isDeclare}
</if> </if>
<if test="route != null and route != ''"> <if test="route != null and route != ''">
and ROUTE = #{route} and ROUTE = #{route}