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

blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java

@@ -42,9 +42,9 @@ public interface RabbitConstant {
 	String WAYBILL_DATA_EXCHANGE = "waybill_data_exchange";
 	String WAYBILL_DATA_ROUTING = "waybill_data_routing";
 
-//	String WAYBILL_DATA_TEST_QUEUE = "waybill_data_test_queue";
-//	String WAYBILL_DATA_TEST_EXCHANGE = "waybill_data_test_exchange";
-//	String WAYBILL_DATA_TEST_ROUTING = "waybill_data_test_routing";
+	String WAYBILL_DATA_TEST_QUEUE = "waybill_data_test_queue";
+	String WAYBILL_DATA_TEST_EXCHANGE = "waybill_data_test_exchange";
+	String WAYBILL_DATA_TEST_ROUTING = "waybill_data_test_routing";
 
 
 	//消费失败队列

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -390,13 +390,13 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 				String customerName = advanceEntity.getCustomerName();//客户名称
 				//通过客户名称去查询客户的服务类型、
-				distributionStockArticleEntity.setTypeService(1);//默认商配
+				distributionStockArticleEntity.setTypeService("1");//默认商配
 				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
 				if(!Objects.isNull(basicdataClientEntity)){
 					Long clientEntityId = basicdataClientEntity.getId();//基础客户
 					BasicdataStoreBusinessEntity basicdataStoreBusinessEntity =  basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId,3);
 					if(!Objects.isNull(basicdataStoreBusinessEntity)){
-						distributionStockArticleEntity.setTypeService(Integer.parseInt(basicdataStoreBusinessEntity.getMold()));
+						distributionStockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
 					}
 				}
 				distributionStockArticleEntity.setCustomerName(customerName);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -28,6 +28,7 @@ import com.logpm.warehouse.service.IWarehouseWaybillService;
 import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.StringUtil;
@@ -271,13 +272,13 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 			String customerName = warehouseWaybill.getConsignee();//客户名称
 			//通过客户名称去查询客户的服务类型、
-			distributionStockArticleEntity.setTypeService(1);//默认商配
+			distributionStockArticleEntity.setTypeService("1");//默认商配
 			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
 			if (!Objects.isNull(basicdataClientEntity)) {
 				Long clientEntityId = basicdataClientEntity.getId();//基础客户
 				BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId, 3);
 				if (!Objects.isNull(basicdataStoreBusinessEntity)) {
-					distributionStockArticleEntity.setTypeService(Integer.parseInt(basicdataStoreBusinessEntity.getMold()));
+					distributionStockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
 				}
 			}
 			distributionStockArticleEntity.setCustomerName(customerName);
@@ -288,7 +289,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			distributionStockArticleEntity.setConsigneeUnit(customerName);//收货单位（经销商）
 			distributionStockArticleEntity.setConsigneePerson(warehouseWaybill.getConsigneeName());//收货人
 			distributionStockArticleEntity.setReserve1("zero");
-			distributionStockArticleEntity.setTenantId("627683");
+			distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);
 			id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 			if (id == 0) {
 				log.warn("#################createStockArticle: 保存订单信息失败  orderSelfNum={}", waybillNo);