fix: 1.修改卸车操作的报错

2.增加发车的时候判断

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java

@@ -12,6 +12,7 @@ import com.rabbitmq.client.Channel;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -51,12 +52,28 @@ public class BusinessPreOrderDataQueueHandler {
 
 	@RabbitHandler
 	public void businessPreOrderDataHandler(Map map, Message message, Channel channel) {
+//
 //		plantA(map);
+
+		R<Tenant> tenant1 = sysClient.getTenant(AuthUtil.getTenantId());
+
+		if(tenant1.isSuccess() && tenant1.getData() != null ){
+			Tenant data = tenant1.getData();
+			if(1==data.getTenantType()){
+				log.info(">>>>>>>>> 当前作业对象 {} 未 商家对象",data.getTenantName() );
+				return ;
+			}
+		}
+
+
 		R<List<Tenant>> tenantList = sysClient.getTenantList();
 
 		if (tenantList.isSuccess()) {
 			List<Tenant> data = tenantList.getData();
 			data.forEach(tenant -> {
+
+
+
 				if (!ObjectUtil.isEmpty(tenant.getTenantType())) {
 					if (2 == tenant.getTenantType()) {
 						List<BasicdataClientEntity> basicdataClientEntitysTenantId = basicdataClientClient.findBasicdataClientEntitysTenantId(tenant.getTenantId());

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

@@ -10719,8 +10719,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<UnloadScanOrderVO> unloadScanOrderList = trunklineCarsLoadScanService.findPackageWithOrderList(loadId, warehouseId);
 		if(CollUtil.isNotEmpty(unloadScanOrderList)){
 			//把unloadScanOrderList中所有元素转化成以orderCode为key的map
-			Map<String, UnloadScanOrderVO> unloadScanOrderMap = unloadScanOrderList.stream().collect(Collectors.toMap(UnloadScanOrderVO::getOrderCode, Function.identity()));
-			Set<String> orderCodeSet = unloadScanOrderMap.keySet();
+//			Map<String, List<UnloadScanOrderVO>> unloadScanOrderMap = unloadScanOrderList.stream().collect(Collectors.toMap(UnloadScanOrderVO::getOrderCode, Function.identity()));
+			Set<String> orderCodeSet = unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toSet());
+//			Map<String, List<UnloadScanOrderVO>> unloadScanOrderMap =unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toList())
+//			Set<String> orderCodeSet = unloadScanOrderMap.keySet();
 			List<OrderCodeNumVO> orderCodeNumList = trunklineAdvanceDetailService.findTotalNumByOrderCodes(orderCodeSet);
 			//把orderCodeNumList中所有元素转化成以orderCode为key的map
 			Map<String, OrderCodeNumVO> orderCodeNumMap = orderCodeNumList.stream().collect(Collectors.toMap(OrderCodeNumVO::getOrderCode, Function.identity()));
@@ -10798,7 +10800,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		int stockCarNumber = realLoadingNumber - unloadNumber;
 
 		trunklineCarsLoadVO.setUnloadNumber(loadLineEntity.getUnloadNumber());
-		trunklineCarsLoadVO.setRealLoadingNumber(stockCarNumber<0?0:stockCarNumber);
+		trunklineCarsLoadVO.setRealLoadingNumber(Math.max(stockCarNumber, 0));
 		trunklineCarsLoadVO.setUnloadScanOrderList(unloadScanOrderList);
 		trunklineCarsLoadVO.setUnloadZeroList(zeroList);
 		trunklineCarsLoadVO.setExceptionList(exceptionList);