Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory/src/main/java/com/logpm/factory/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java

@@ -93,7 +93,7 @@ public class MtFactoryDataController extends BladeController {
 				if (!Objects.isNull(mainId)) {
 					asyncDataService.handlerMtDataToHt(map.get("mainId"));
 					// 走新系统暂存单
-					asyncDataService.handlerMtDataToHtNew(map.get("mainId"));
+//					asyncDataService.handlerMtDataToHtNew(map.get("mainId"));
 				}
 			} else {
 				orderStatusLog.setStatus(2);

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java

@@ -126,7 +126,7 @@ public class PanFactoryDataController extends BladeController {
 		if(!Objects.isNull(orderId)){
 			syncDataService.handlerPanDataToHt(orderId);
 			// 走新系统暂存单
-			syncDataService.handlerPanDataToHtNew(orderId);
+//			syncDataService.handlerPanDataToHtNew(orderId);
 		}
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/CustomMessageConverter.java

@@ -19,13 +19,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.List;
 import java.util.Map;
 
@@ -73,7 +67,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java

@@ -18,6 +18,7 @@ import org.springblade.common.constant.IncomingTypeEnum;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.core.Message;
@@ -48,6 +49,7 @@ public class AdvanceToLoadListener {
 	@Transactional(rollbackFor = Exception.class)
 	public void advanceToLoad(Map map, Message message, Channel channel){
 		String msg = (String) map.get("messageData");
+		String tenantId1 = AuthUtil.getTenantId();
 		if(StringUtil.isNotBlank(msg)){
 			log.info("#############advanceToLoad: 暂存单包件入库并且绑定到对应车次上 {}", msg);
 			JSONObject jsonObject = JSONUtil.parseObj(msg);
@@ -79,7 +81,7 @@ public class AdvanceToLoadListener {
 				inComingDTO.setTenantId(TenantNum.HUITONGCODE);
 				inComingDTO.setOrderPackageCode(orderPackageCode);
 				inComingDTO.setWarehouseId(warehouseId);
-				inComingDTO.setWarehouseName(warehouseName);
+//				inComingDTO.setWarehouseName(warehouseName);
 				inComingDTO.setTenantId(advanceDetailEntity.getTenantId());
 				inComingDTO.setUserId(advanceDetailEntity.getCreateUser());
 				inComingDTO.setDeptId(advanceDetailEntity.getCreateDept());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -46,6 +46,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.feign.IRegionFeign;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -95,6 +96,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final IBasicdataStoreContactClient basicdataStoreContactClient;
 	private final IAsyncService asyncService;
 	private final ICarsLoadAsyncService carsLoadAsyncService;
+	private final RabbitTemplate rabbitTemplate;
 
 	@Override
 	public IPage<TrunklineAdvanceVO> advancePageList(AdvanceDTO advanceDTO) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -22,7 +22,6 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
-import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -151,32 +150,29 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 				String thirdPackName = advanceDetailEntity.getThirdPackName();
 
 
-				WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
-				if(Objects.isNull(waybillEntity)){
-					log.warn("运单信息不存在 waybillId={}",waybillId);
-					throw new CustomerException(405,"运单信息不存在");
+				if(!Objects.isNull(waybillId)){
+					WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
+					if(!Objects.isNull(waybillEntity)){
+						vo.setShipperName(waybillEntity.getShipper());
+						vo.setShipperAddress(waybillEntity.getShipperAddress());
+						vo.setMallName(waybillEntity.getConsignee());
+						vo.setWaybillsNum(waybillEntity.getTotalCount()+"");
+						vo.setObjective(waybillEntity.getDestinationWarehouseName());
+						vo.setDepartureStation(waybillEntity.getDepartureWarehouseName());
+						vo.setWaybillNumber(waybillEntity.getWaybillNo());
+					}
 				}
-				String shipper = waybillEntity.getShipper();
-				String shipperAddress = waybillEntity.getShipperAddress();
-				String consignee = waybillEntity.getConsignee();
-
 
 				vo.setOrderCode(orderCode);
-				vo.setShipperName(shipper);
-				vo.setShipperAddress(shipperAddress);
-				vo.setMallName(consignee);
 				vo.setCustomerName(advanceEntity.getCustomerName());
 				vo.setCustomerTelephone(advanceEntity.getCustomerPhone());
 				vo.setCustomerAddress(advanceEntity.getCustomerAddress());
 				vo.setMaterialName(advanceDetailEntity.getMaterialName());
 				vo.setCategory(firstPackName+"/"+secondPackName+"/"+thirdPackName);
-				vo.setWaybillsNum(waybillEntity.getTotalCount()+"");
-				vo.setObjective(waybillEntity.getDestinationWarehouseName());
-				vo.setDepartureStation(waybillEntity.getDepartureWarehouseName());
 				vo.setDealerCode(advanceEntity.getDealerCode());
 				vo.setDealerName(advanceEntity.getDealerName());
 				vo.setQrCode(orderPackageCode);
-				vo.setWaybillNumber(waybillEntity.getWaybillNo());
+
 				vo.setTotalNumber(advanceEntity.getTotalNum()+"");
 			}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -3082,7 +3082,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			int code = r.getCode();
 			if(code != 200){
 				log.warn("##########findNextNodeList: 打托失败 trayCode={} orderPackageCode={} msg={}", trayCode, orderPackageCode,r.getMsg());
-				return R.fail(405, r.getMsg());
+				return R.fail(code, r.getMsg());
 			}
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 			orders = parcelListEntity.getOrderCode();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/CustomMessageConverter.java

@@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve
 		Map<String, Object> headers = properties.getHeaders();
 		HttpHeaders httpHeaders = new HttpHeaders();
 		for (Map.Entry<String, Object> entry : headers.entrySet()) {
-			if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) {
+			if (StrUtil.equals("Blade-Auth", entry.getKey())
+				|| StrUtil.equals("Authorization", entry.getKey())
+				|| StrUtil.equals("blade-auth", entry.getKey())
+				|| StrUtil.equals("authorization", entry.getKey())) {
 				List value = (List) entry.getValue();
 				for (Object o : value) {
 					httpHeaders.add(entry.getKey(), String.valueOf(o));