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

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
王奎兴
2026-06-10 19:48:02 +08:00
parent f4e47fa0c9 d63191829e
commit 2e1117728a
10 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+5 -1
View File
@@ -189,6 +189,10 @@ public class BusinessDocumentOrderApplicationService {
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
// 查询组织对应的推送签名，没有则用全局默认
String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null;
String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey;
int successCount = 0;
int failCount = 0;
StringBuilder failMsg = new StringBuilder();
@@ -304,7 +308,7 @@ public class BusinessDocumentOrderApplicationService {
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader("verify", verifyKey);
httpPost.setHeader("verify", finalVerifyKey);
if ("I".equals(order.getIeType())) {
httpPost.setHeader("apiName", API_NAME_I);
} else if ("E".equals(order.getIeType())) {
mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java
+9 -1
View File
@@ -9,6 +9,7 @@ import com.mhd.common.core.web.page.TableDataInfo;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.domain.gwLog.entity.GwLog;
import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.oms.interfaces.dto.businessPartner.BusinessPartnerDTO;
import com.mhd.system.api.UserServiceFeign;
import com.mhd.system.api.domain.UserShipperQueryDTO;
@@ -45,6 +46,8 @@ public class BusinessPartnerApplicationService {
@Resource
private GwLogMapper gwLogMapper;
@Resource
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
@@ -86,6 +89,10 @@ public class BusinessPartnerApplicationService {
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
// 查询组织对应的推送签名，没有则用全局默认
String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null;
String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey;
int successCount = 0;
int failCount = 0;
StringBuilder failMsg = new StringBuilder();
@@ -96,6 +103,7 @@ public class BusinessPartnerApplicationService {
Map<String, String> item = new HashMap<>();
item.put("corpCode", businessPartnerDTO.getCorpCode());
item.put("corpName", businessPartnerDTO.getCorpName());
item.put("stopFlag", "0");
// 包装成数组
List<Map<String, String>> bodyList = new ArrayList<>();
@@ -124,7 +132,7 @@ public class BusinessPartnerApplicationService {
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader("apiName", API_NAME);
httpPost.setHeader("verify", verifyKey);
httpPost.setHeader("verify", finalVerifyKey);
try{
CloseableHttpResponse response = httpClient.execute(httpPost);
String responseString = EntityUtils.toString(response.getEntity());
mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java
+9 -1
View File
@@ -12,6 +12,7 @@ import com.mhd.oms.domain.erpCountry.repository.mapper.ErpCountryMapper;
import com.mhd.oms.domain.erpCountry.repository.po.ErpCountryPO;
import com.mhd.oms.domain.gwLog.entity.GwLog;
import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.oms.interfaces.dto.erpCountry.ErpCountryDTO;
import com.mhd.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
@@ -46,6 +47,9 @@ public class ErpCountryApplicationService{
@Resource
private GwLogMapper gwLogMapper;
@Resource
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
public TableDataInfo queryList(ErpCountryDTO erpCountryDTO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null) {
@@ -133,6 +137,10 @@ public class ErpCountryApplicationService{
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
// 查询组织对应的推送签名，没有则用全局默认
String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null;
String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey;
int successCount = 0;
int failCount = 0;
StringBuilder failMsg = new StringBuilder();
@@ -172,7 +180,7 @@ public class ErpCountryApplicationService{
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader("apiName", API_NAME);
httpPost.setHeader("verify", verifyKey);
httpPost.setHeader("verify", finalVerifyKey);
try {
CloseableHttpResponse response = httpClient.execute(httpPost);
mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java
+9 -1
View File
@@ -14,6 +14,7 @@ import com.mhd.oms.domain.erpEnterpriseUnit.repository.po.ErpEnterpriseUnitPO;
import com.mhd.oms.domain.erpEnterpriseUnit.repository.todo.ErpEnterpriseUnitDO;
import com.mhd.oms.domain.gwLog.entity.GwLog;
import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.oms.interfaces.dto.erpEnterpriseUnit.ErpEnterpriseUnitDTO;
import com.mhd.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
@@ -48,6 +49,9 @@ public class ErpEnterpriseUnitApplicationService {
@Resource
private GwLogMapper gwLogMapper;
@Resource
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
public TableDataInfo queryList(ErpEnterpriseUnitDO erpEnterpriseUnitDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null) {
@@ -117,6 +121,10 @@ public class ErpEnterpriseUnitApplicationService {
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
// 查询组织对应的推送签名，没有则用全局默认
String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null;
String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey;
int successCount = 0;
int failCount = 0;
StringBuilder failMsg = new StringBuilder();
@@ -156,7 +164,7 @@ public class ErpEnterpriseUnitApplicationService {
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader("apiName", API_NAME);
httpPost.setHeader("verify", verifyKey);
httpPost.setHeader("verify", finalVerifyKey);
try {
CloseableHttpResponse response = httpClient.execute(httpPost);
mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
+9 -1
View File
@@ -8,6 +8,7 @@ import com.mhd.common.core.web.page.TableDataInfo;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.domain.gwLog.entity.GwLog;
import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.oms.interfaces.dto.exchangeRate.ExchangeRateDTO;
import com.mhd.system.api.WlhyServiceFeign;
import com.mhd.system.api.model.LoginUser;
@@ -44,6 +45,9 @@ public class ExchangeRateApplicationService {
@Resource
private GwLogMapper gwLogMapper;
@Resource
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
public TableDataInfo queryExchangeRateList(Integer pageNum, Integer pageSize, String pushStatus, String organizationId) {
try {
log.info("查询汇率列表: pageNum={}, pageSize={}, pushStatus={}, organizationId={}",
@@ -96,6 +100,10 @@ public class ExchangeRateApplicationService {
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
// 查询组织对应的推送签名，没有则用全局默认
String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null;
String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey;
int successCount = 0;
int failCount = 0;
StringBuilder failMsg = new StringBuilder();
@@ -133,7 +141,7 @@ public class ExchangeRateApplicationService {
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader("apiName", API_NAME);
httpPost.setHeader("verify", verifyKey);
httpPost.setHeader("verify", finalVerifyKey);
try {
CloseableHttpResponse response = httpClient.execute(httpPost);
mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
+9 -1
View File
@@ -9,6 +9,7 @@ import com.mhd.common.core.web.page.TableDataInfo;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.domain.gwLog.entity.GwLog;
import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.system.api.WmsServiceFeign;
import com.mhd.system.api.domain.MaterialInfoDTO;
import com.mhd.system.api.model.LoginUser;
@@ -41,6 +42,9 @@ public class MaterialInfoApplicationService {
@Resource
private GwLogMapper gwLogMapper;
@Resource
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
private final WmsServiceFeign wmsServiceFeign;
public MaterialInfoApplicationService(WmsServiceFeign wmsServiceFeign) {
@@ -77,6 +81,10 @@ public class MaterialInfoApplicationService {
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
// 查询组织对应的推送签名，没有则用全局默认
String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null;
String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey;
int successCount = 0;
int failCount = 0;
StringBuilder failMsg = new StringBuilder();
@@ -123,7 +131,7 @@ public class MaterialInfoApplicationService {
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader("apiName", API_NAME);
httpPost.setHeader("verify", verifyKey);
httpPost.setHeader("verify", finalVerifyKey);
try {
CloseableHttpResponse response = httpClient.execute(httpPost);
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java
+2
View File
@@ -35,4 +35,6 @@ public interface BusinessDocumentOrderMapper extends BaseMapper<BusinessDocument
String getTmsOrderInfo(@Param("goodsNumber") String goodsNumber);
TmsTransportNote getTmsTransportNote(@Param("tmsOrderId") String tmsOrderId);
String getPushVerifyByOrgId(@Param("organizationId") Long organizationId);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+1 -1
View File
@@ -1976,7 +1976,7 @@ public class ReservationStockInOrderApplicationService {
if (lotNo != null) {
String[] split = lotNo.split("-");
if (split.length == 2) {
gwInDetail.setLine_num(split[1]);
gwInDetail.setLine_num(Integer.valueOf(split[1]));
}
}
gwInDetail.setItem_no(materialBaseInfoId.toString());
mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+4
View File
@@ -1261,4 +1261,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</sql>
<select id="getPushVerifyByOrgId" resultType="java.lang.String">
select PUSH_VERIFY from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID = #{organizationId}
</select>
</mapper>
mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java
+2 -1
View File
@@ -116,6 +116,7 @@ public class Organization extends BaseVOEntity implements Serializable {
private String ncCode;
@ApiModelProperty("是否排队：0-否，1-是")
private Integer isQueue;
@ApiModelProperty("推送验证密钥")
private String pushVerify;
}