fix:修复商场端的查询

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

@@ -1300,8 +1300,26 @@
 
         select ldr.* from logpm_distribution_reservation ldr
         where ldr.delivery_type=2
-        <if test="distrbutionReservation.reservationStatus != null">
-            and ldr.reservation_status = #{distrbutionReservation.reservationStatus}
+        <if test="distrbutionReservation.reservationCode != null" >
+            and ldr.reservation_code like concat(#{distrbutionReservation.reservationCode},'%')
+        </if>
+        <if test="distrbutionReservation.serviceNumber != null">
+            and ldr.service_number like concat(#{distrbutionReservation.serviceNumber},'%')
+        </if>
+        <if test="distrbutionReservation.stockArticleId != null">
+            and ldr.stock_article_id like concat('%',#{distrbutionReservation.stockArticleId},'%')
+        </if>
+        <if test="distrbutionReservation.mallName != null">
+            and ldr.mall_name like concat(#{distrbutionReservation.mallName},'%')
+        </if>
+        <if test="distrbutionReservation.consignee != null">
+            and ldr.consignee like concat('%',#{distrbutionReservation.consignee},'%')
+        </if>
+        <if test="distrbutionReservation.deliveryPhone != null">
+            and ldr.delivery_phone =#{distrbutionReservation.deliveryPhone}
+        </if>
+        <if test="distrbutionReservation.deliveryAddress != null">
+            and ldr.delivery_address like concat('%',#{distrbutionReservation.deliveryAddress},'%')
         </if>
         <if test="distrbutionReservation.clientIds != null">
             and ldr.mall_id in

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

@@ -433,9 +433,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				}
 			}
 			//查询这个费用
-			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
-				.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLading.getId())
-			);
+//			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
+//				.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLading.getId())
+//			);
 			//修改订单数据
 			if (!distrilbutionBillLading.getStockArticleList().isEmpty()) {
 				List<JSONObject> jsonObjects = handleOrder(distrilbutionBillLading, billLadingEntity.getPickupBatch());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -72,7 +72,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 			}
 		}
 //		distributionStockupVO.setIsZeroString("1".equals(distributionStockupVO.getIsZero())?"是":"否");
-		distributionStockupVO.setReservationNum(entity.getHandQuantity()-entity.getDeliveryQuantity());
+		distributionStockupVO.setReservationNum(entity.getHandQuantity());
 		buildVoInfor(distributionStockupVO);
 		return distributionStockupVO;
 	}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -816,6 +816,26 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		return orderStatusLog;
 	}
 
+	private OpPackagePushLogEntity sendPushOuPaiDataNew(Long refId, String url, Integer pushType, JSONObject data) {
+
+			OpPackagePushLogEntity opPackagePushLogEntity = new OpPackagePushLogEntity();
+			opPackagePushLogEntity.setArgs(data.toJSONString());
+			opPackagePushLogEntity.setPushType(pushType);
+			opPackagePushLogEntity.setUrl(url);
+			opPackagePushLogEntity.setRefId(refId);
+			opPackagePushLogEntity.setPushOupaiNode(data.getString("Operate"));
+
+
+			String token = buildToken();
+			HttpResponse httpResponse = HttpRequest.post(url).header("Authorization", token).body(data.toJSONString()).execute();
+			String result = httpResponse.body();
+			opPackagePushLogEntity.setResp(result);
+			opPackagePushLogService.save(opPackagePushLogEntity);
+			return opPackagePushLogEntity;
+
+	}
+
+
 	/**
 	 * 发送请求
 	 *
@@ -824,6 +844,24 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	private OpPackagePushLogEntity sendPushOuPaiData(Long refId, String url, Integer pushType, JSONObject data) {
 
 
+
+		// 需要判断出库节点是否已经回传了入库节点
+		String o = data.getString("Operate");
+		if ("发货".equals(o)) {
+			// 判断是否有入库数
+
+			LambdaQueryWrapper<OpPackagePushLogEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(OpPackagePushLogEntity::getRefId, refId);
+			lambdaQueryWrapper.eq(OpPackagePushLogEntity::getPushOupaiNode, "收货");
+			lambdaQueryWrapper.eq(OpPackagePushLogEntity::getPushType, pushType);// 查询包件
+			List<OpPackagePushLogEntity> list = opPackagePushLogService.list(lambdaQueryWrapper);
+			if(list.isEmpty()){
+				data.put("Operate","收货");
+				OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiDataNew(refId, url, 1, data);
+				data.put("Operate","发货");
+            }
+		}
+
 		LambdaQueryWrapper<OpPackagePushLogEntity>  lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(OpPackagePushLogEntity::getRefId, refId);
 		lambdaQueryWrapper.eq(OpPackagePushLogEntity::getPushOupaiNode, data.getString("Operate"));
@@ -849,6 +887,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		}
 
 
+
+
+
+
 	}