修改自提扫描数据推送

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

@@ -2920,7 +2920,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionBillLadingScan.setScanUser(AuthUtil.getUser().getNickName());
 
 
-			return processScan(type, billLadingId, coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
+			return processScan(type, distributionBillLadingScan.getBillLadingId(), coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
 
 //			return Resp.scanSuccess("签收成功", "签收成功");
 		} catch (Exception e) {
@@ -2950,7 +2950,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return !list3.isEmpty();
 	}
 
-	private Resp processScan(String type, Object billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan, BasicdataWarehouseEntity warehouse, String pickupBatch) {
+	private Resp processScan(String type, Long billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan, BasicdataWarehouseEntity warehouse, String pickupBatch) {
 		if ("1".equals(type)) {
 			// 处理库存品包件逻辑
 			return handleOrderProduct(type, billLadingId, coding, distributionBillLadingScan, warehouse, pickupBatch);