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

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -185,7 +185,7 @@
         lwtg.create_user operateUser
         FROM
         logpm_warehouse_tray_goods lwtg
-        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id
+        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id AND lwtg.incoming_batch = ldsl.incoming_batch
         LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id
         LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id
         LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -2,6 +2,7 @@ package com.logpm.distribution.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -43,6 +44,7 @@ import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.Inventory.InventoryPackageStatusConstant;
 import org.springblade.common.constant.Inventory.InventorySigningStatusConstant;
+import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
@@ -62,6 +64,7 @@ import org.springblade.common.constant.stockup.StockupTypeConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -118,6 +121,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient;
 	private final IWarehouseWaybillClient waybillClient;
 	private final FactoryDataMessageSender factoryDataMessageSender;
+	private final RabbitTemplate rabbitTemplate;
 
 //	private final
 
@@ -1440,7 +1444,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Transactional(rollbackFor = Exception.class)
 	@LogpmAsync("asyncExecutor")
 	public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
-		String brands = "梦天,欧派,志邦";//可追加
+		String brands = "梦天,欧派,志邦,皮阿诺";//可追加
 		log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId：=" + signingId + "warehouseName：=" + warehouseName + "warehouseId：=" + warehouseId);
 		//查询签收信息
 		DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);
@@ -1565,6 +1569,28 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					factoryDataMessageSender.sendNodeDataByBrand(msg);
 
 				}
+				if (Func.isNotEmpty(brand.get("皮阿诺"))) {
+					List<MtReceiveContentDTO> zb = brand.get("皮阿诺");
+					if (CollUtil.isNotEmpty(zb)) {
+						for (MtReceiveContentDTO mtReceiveContentDTO : zb) {
+							try {
+								// 发送入库消息
+								com.logpm.distribution.dto.OrderStatusDTO orderStatusDTO = new com.logpm.distribution.dto.OrderStatusDTO();
+								// 通过包件id 查询包件
+								orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo());
+								orderStatusDTO.setOrderNo(mtReceiveContentDTO.getOrderCode());
+								orderStatusDTO.setStatus("7");
+								orderStatusDTO.setOperationTime(DateUtil.now());
+								orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
+								Map<String, Object> map = new HashMap<>();
+								map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
+								rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+							} catch (Exception e) {
+								log.error("入库推送失败：{}", e);
+							}
+						}
+					}
+				}
 
 				//....工厂
 			} catch (Exception e) {

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

@@ -21,8 +21,8 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry interceptorRegistry) {
-		interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties))
-			.addPathPatterns("/**").order(2);
+//		interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties))
+//			.addPathPatterns("/**").order(2);
 		interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment))
 			.addPathPatterns("/**").order(3);
 	}

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java

@@ -1,21 +1,16 @@
 package com.logpm.factorydata.zbom.controller;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factorydata.enums.SaxStatusEnums;
 import com.logpm.factorydata.feign.IFactoryDataClient;
 import com.logpm.factorydata.vo.SendMsg;
 import com.logpm.factorydata.zbom.constants.ZbomConstants;
 import com.logpm.factorydata.zbom.entity.FactoryLogEntity;
-import com.logpm.factorydata.zbom.entity.ZbFactoryOrderLogEntity;
-import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
 import com.logpm.factorydata.zbom.service.FactoryLogService;
-import com.logpm.factorydata.zbom.service.IFactoryOrderLogService;
-import com.logpm.factorydata.zbom.service.IReceiptService;
 import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
 import com.logpm.factorydata.zbom.vo.ZbResp;
 import io.swagger.annotations.Api;
@@ -31,6 +26,7 @@ import org.springblade.common.utils.FileLogsUtil;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
 import org.springblade.resource.feign.IOssClient;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,8 +59,22 @@ public class OrderController {
 	private final FactoryLogService factoryLogService;
 
 	private final IOssClient ossClient;
+	private final RabbitTemplate rabbitTemplate;
 
 
+	@ResponseBody
+	@PostMapping("pushData")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "推送志邦工厂节点数据", notes = "推送志邦工厂节点数据")
+	public ZbResp pushData(@RequestBody String msg, HttpServletRequest request) {
+		log.info("推送志邦工厂节点数据：{}", msg);
+		if (StrUtil.isNotEmpty(msg)) {
+			rabbitTemplate.convertAndSend(FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH,
+				FactoryDataConstants.Mq.RoutingKeys.ZBOM_NODE_DATA_PUSH, msg);
+		}
+		return ZbResp.success("成功");
+	}
+
 	@ResponseBody
 	@PostMapping
 	@ApiOperationSupport(order = 1)

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

@@ -408,12 +408,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
 				factoryDataMessageSender.sendNodeDataByBrand(msg);
 				// 推送梦天工厂
-				SendMsg build = SendMsg.builder()
-					.exchange(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_EXCHANGE)
-					.routingKey(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_ROUTING)
-					.message(JSONUtil.toJsonStr(msg))
-					.build();
-				factoryDataClient.sendMessage(build);
+				rabbitTemplate.convertAndSend(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_EXCHANGE, RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_ROUTING, msg);
 			}
 		}
 	}