fix:修改在库订单查询

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -546,7 +546,7 @@
         ldsa.stockup_status, ldsa.reservation_status, ldsa.order_status, ldsa.grounding_status,
         ldsa.order_receive_status,
         ldsa.freeze_status, ldsa.notification, ldsa.fee, ldsa.rate, ldsa.advance_id, ldsa.waybill_id,
-        ldpl.waybill_number
+        group_concat( DISTINCT ldpl.waybill_number ) AS waybillNumber,
         ldsa.consignee_unit, ldsa.collect_fee, ldsa.storage_fee, ldsa.consignee_person, ldsa.consignee_address,
         ldsa.consignee_mobile, ldsa.warehouse_entry_time_end,
         ldsa.sorting_quantity, ldsa.delivery_quantity, ldsa.transfer_quantity,

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,6 +21,12 @@ public class OrderPackageStatusPushFailLogServiceImpl extends BaseServiceImpl<Or
 	public void saveOrderPackageStatusFaleLog(String unitNo, String currentWarehouseId, String status,String operationTime, Integer trayId) {
 		log.info("##############dealWithDataHandler: unitNo={} 没有查询到数据 保存到待处理数据库", unitNo);
 
+
+		if(StringUtil.isBlank(currentWarehouseId)){
+			log.info(">>>>>>>>>>>>>>>> 没有仓库信息 不进行记录");
+			return ;
+		}
+
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("unit_no", unitNo);
 		queryWrapper.eq("warehouse_id", currentWarehouseId);