Merge branch 'dev' into pre-production

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

@@ -24,4 +24,6 @@ public class InComingDTO implements Serializable {
 
 	private List<Long> advanceIds;//暂存单ids
 
+	private List<String> orderCodes;
+
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1643,7 +1643,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 					entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
 					if(!Objects.isNull(waybillEntity)){
 						String warehouseName = waybillEntity.getWarehouseName();//目的仓
+						Integer warehouseId1 = waybillEntity.getWarehouseId();
 						BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName);
+						if(Objects.isNull(endhouse)){
+							endhouse = basicdataWarehouseClient.getWarehouseByOldId(warehouseId1);
+						}
 						Long endWarehouseId = endhouse.getId();
 						if(endWarehouseId.equals(warehouseId)){
 							entity.setIsTransfer(0);

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

@@ -146,7 +146,10 @@
             and lta.train_number = #{param.incomingCode}
         </if>
         <if test="param.incomingType == 5" >
-            and lta.order_code = #{param.incomingCode}
+            and lta.order_code in
+            <foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
     </select>
 

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

@@ -19,10 +19,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @Slf4j
 @Service
@@ -126,6 +123,19 @@ public class InComingServiceImpl implements IInComingService {
 
 	@Override
 	public R findIncomingOrderList(InComingDTO inComingDTO) {
+		Integer incomingType = inComingDTO.getIncomingType();
+		if(incomingType == 5){
+			String incomingCode = inComingDTO.getIncomingCode();
+			incomingCode = incomingCode.replaceAll("，",",");
+			List<String> orderCodes = new ArrayList<>();
+			if(incomingCode.contains(",")){
+				orderCodes.addAll(Arrays.asList(incomingCode.split(",")));
+			}else{
+				orderCodes.add(incomingCode);
+			}
+			inComingDTO.setOrderCodes(orderCodes);
+		}
+
 		List<TrunklineAdvanceVO> ls = advanceService.findIncomingOrderList(inComingDTO);
 		for (TrunklineAdvanceVO advanceVO : ls) {
 			Long advanceId = advanceVO.getId();