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

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java

@@ -41,5 +41,6 @@ public class OrderDetailInfoVO implements Serializable {
 	private String importWarehouseName;
 	private String createUserName;
 	private Date createTime;
+	private Date incomingTime;
 
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java

@@ -45,6 +45,10 @@ public class SignPushClient implements IOldSignPushClient {
 			JSONObject res = JSON.parseObject(body);
 			if ("200".equals(res.getString("code"))) {
 				result= true;
+			}else {
+				String msg = res.getString("msg");
+				log.info(">>>> pushOldSystemSignInfo response msg:{}",msg);
+				log.info(">>>> pushOldSystemSignInfo 推送配送ID signPushDataDTO ID:{}",signPushDataDTO.getId());
 			}
 		}
 		log.info(">>>> pushOldSystemSignInfo response url:{}  body:{}",url,body);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java

@@ -40,4 +40,7 @@ public class OrderDetailsDTO implements Serializable {
 	private String createTimeEndStr;//创建时间
 	private Date createTimeEnd;//创建时间
 
+	private Date incomingTimeStart;//入库时间开始
+	private Date incomingTimeEnd;//入库时间结束
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -254,7 +254,8 @@
             ldl.signing_time deliverySignTime,
             ltad.warehouse_name importWarehouseName,
             lta.create_user_name createUserName,
-            lta.create_time createTime
+            lta.create_time createTime,
+            ltad.incoming_time incomingTime
         from logpm_trunkline_advance_detail ltad
          left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
          left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltad.order_package_code and ldpl.warehouse_id = ltad.now_warehouse_id
@@ -322,6 +323,12 @@
         <if test="param.createTimeEnd != null ">
             and ltad.create_time  &lt;= #{param.createTimeEnd}
         </if>
+        <if test="param.incomingTimeStart != null  ">
+            and ltad.incoming_time  &gt;= #{param.incomingTimeStart}
+        </if>
+        <if test="param.incomingTimeEnd != null ">
+            and ltad.incoming_time  &lt;= #{param.incomingTimeEnd}
+        </if>
 
     </select>
 

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

@@ -76,6 +76,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static cn.hutool.poi.excel.sax.AttributeName.s;
+
 @Slf4j
 @Service
 @AllArgsConstructor
@@ -1749,7 +1751,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 			carsLoadEntity.setLoadStatus("40");
 		}else{
-			Long startWarehouseId = Long.parseLong(split[0]);
+			Long startWarehouseId = carsLoadEntity.getStartWarehouseId();
 			if(startWarehouseId.equals(warehouseId)){
 				carsLoadEntity.setLoadStatus("0");
 			}else{

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -2988,10 +2988,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	private R<Object> extracted(Long questId, QuestDetailEntity questDetail) {
 
 
-		List<TaskQuestChildVO> taskQuestChildVOS = bladeRedis.get(RedisKeyConstant.TASK_QUEST_CHILD_KEY);
+		List<TaskQuestChildVO> taskQuestChildVOS = bladeRedis.get(RedisKeyConstant.TASK_QUEST_CHILD_KEY+questId);
 		if (taskQuestChildVOS == null) {
 			taskQuestChildVOS = taskQuestChildService.selectlistByMasterId(questId);
-			bladeRedis.setEx(RedisKeyConstant.TASK_QUEST_CHILD_KEY, taskQuestChildVOS, 1000L);
+			if(taskQuestChildVOS!=null){
+				bladeRedis.setEx(RedisKeyConstant.TASK_QUEST_CHILD_KEY+questId, taskQuestChildVOS, 1000L);
+			}
 		}