1.干线bug修复

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

@@ -189,4 +189,6 @@ public class LoadCarsDTO implements Serializable {
 	private List<TrunklineCarsLoadLinePhotoEntity> addUrlList = new ArrayList<>();
 	private List<Long> removeUrlList = new ArrayList<>();
 
+	private Long endWarehouseId;
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -53,9 +53,17 @@ public class CarsLoadController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			List<Long> warehouseIds = new ArrayList<>();
 			if(!Objects.isNull(myCurrentWarehouse)){
-				loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+				Long warehouseId = myCurrentWarehouse.getId();
+				warehouseIds.add(warehouseId);
+			}else{
+				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+				myWatchWarehouse.forEach(warehouseEntity -> {
+					warehouseIds.add(warehouseEntity.getId());
+				});
 			}
+			loadCarsDTO.setWarehouseIds(warehouseIds);
 
 			IPage<TrunklineCarsLoadVO> pages = carsLoadService.loadCarsPageList(loadCarsDTO);
 
@@ -80,9 +88,18 @@ public class CarsLoadController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			List<Long> warehouseIds = new ArrayList<>();
 			if(!Objects.isNull(myCurrentWarehouse)){
-				loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+				Long warehouseId = myCurrentWarehouse.getId();
+				warehouseIds.add(warehouseId);
+			}else{
+				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+				myWatchWarehouse.forEach(warehouseEntity -> {
+					warehouseIds.add(warehouseEntity.getId());
+				});
 			}
+			loadCarsDTO.setWarehouseIds(warehouseIds);
+
 			IPage<TrunklineCarsLoadVO> pages = carsLoadService.arriveCarsPageList(loadCarsDTO);
 			return R.data(pages);
 		}catch (CustomerException e){

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

@@ -42,9 +42,18 @@
         where ltcl.is_deleted = 0
           and ltcl.load_type != '4'
           and ltcl.load_status != '100'
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0" >
+            and ltcl.start_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="param.warehouseId != null" >
             and ltcl.start_warehouse_id = #{param.warehouseId}
         </if>
+        <if test="param.endWarehouseId != null" >
+            and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0
+        </if>
         <if test="param.loadCarsNo != null and param.loadCarsNo != ''">
             and ltcl.cars_no = #{param.loadCarsNo}
         </if>
@@ -132,9 +141,18 @@
         where ltcl.is_deleted = 0
         and ltcl.load_status != '100'
         and ltcl.load_type != '4'
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0" >
+            and ltcl.start_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="param.warehouseId != null" >
             and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
         </if>
+        <if test="param.endWarehouseId != null" >
+            and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0
+        </if>
         <if test="param.warehouseName != null and param.warehouseName != ''">
             and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
         </if>