1.发车提示

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java

@@ -121,6 +121,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	 */
 	@ApiModelProperty(value = "备货地址")
 	private String stockupArea;
+	/**
+	 * 发车时间
+	 */
+	@ApiModelProperty(value = "备货地址")
+	private String departureTime;
 
 
 

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanInventoryRecordVO.java

@@ -0,0 +1,87 @@
+package com.logpm.warehouse.vo;
+
+
+import com.logpm.distribution.entity.DistributionStockListEntity;
+import com.logpm.warehouse.entity.WarehouseScanRecordEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseScanInventoryRecordVO extends DistributionStockListEntity {
+
+	/**
+	 * 节点名称
+	 */
+	@ApiModelProperty(value = "节点名称")
+	private String nodeName;
+
+	/**
+	 * 操作时间
+	 */
+	@ApiModelProperty(value = "操作时间")
+	private String operatorTime;
+	/**
+	 * 操作人
+	 */
+	@ApiModelProperty(value = "操作人")
+	private Long operatorId;
+
+	/**
+	 * 操作人(Name)
+	 */
+	@ApiModelProperty(value = "操作人(Name)")
+	private String operatorName;
+
+	/**
+	 * 扫描相亲
+	 */
+	@ApiModelProperty(value = "扫描相亲")
+	private String scanNodeMsg;
+
+	/**
+	 * 二级扫描类型(扫描详情)
+	 */
+	@ApiModelProperty(value = "扫描详情")
+	private String scanNodeType;
+
+
+	/**
+	 * 仓库List
+	 */
+	@ApiModelProperty(value = "仓库List")
+	private List<Long> warehouseIdList;
+
+//	/**
+//	 * 包件状态
+//	 */
+//	@ApiModelProperty(value = "包件状态")
+//	private String orderPackageStatusName;
+//
+//	@ApiModelProperty(value = "包件冻结状态")
+//	private String orderPackageFreezeStatusName;
+//
+//	@ApiModelProperty(value = "包件冻结状态")
+//	private String orderPackageReservationStatusName;
+//
+//
+//
+//	@ApiModelProperty(value = "备货状态")
+//	private String orderPackageStockupStatusName;
+//
+//	@ApiModelProperty(value = "上架状态")
+//	private String orderPackageGroundingStatusName;
+//
+//	@ApiModelProperty(value = "装车状态")
+//	private String orderPackageLoadingStatusName;
+
+//	/**
+//	 * 二级扫描类型（name）
+//	 */
+//	@ApiModelProperty(value = "二级扫描类型(name)")
+//	private String scanNodeTypeName;
+}

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

@@ -670,20 +670,11 @@
         where lddl.reservation_id = #{reservationId} and    lds.coding  =#{barcode}
     </select>
     <select id="selectDistributionAppDeliveryListPage"  resultType="com.logpm.distribution.vo.app.DistributionAppDeliveryListVO">
-        SELECT  DISTINCT lddl.id id,  lddl.train_number trainNumber,
+        SELECT  DISTINCT lddl.id id,  lddl.train_number trainNumber,ldds.departure_time departureTime,
-        <!--lddl.warehouse_name warehouseName,
+
-        lddl.warehouse_id warehouseId, -->
         lddl.type type,  lddl.kind kind, lddl.vehicle_name vehicleName, lddl.driver_name driverName,
         lddl.vehicle_id vehicleId, lddl.driver_id driverId, lddl.delivery_status deliveryStatus, lddl.preparation_time preparationTime,
-        <!-- lddl.distribution_company distributionCompany,
+
-         lddl.state state,
-         (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',') FROM
-         logpm_distribution_signfor lds
-         join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
-         join logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
-         join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
-         WHERE lds.delivery_id = lddl.id
-         ) forkliftName, -->
         lddl.create_time createTime, lddl.customers_number customersNumber,
         lddl.price price, lddl.added_services_id addedServicesId,
         (SELECT COALESCE (COUNT(*) ,0)

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

@@ -2978,7 +2978,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//修改主表状态
 		distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
 		baseMapper.updateById(distributionDeliveryListEntity);
-
 		return R.status(b);
 	}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java

@@ -22,6 +22,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.warehouse.entity.WarehouseStockEntity;
 import com.logpm.warehouse.excel.WarehouseStockExcel;
 import com.logpm.warehouse.service.IWarehouseStockService;
+import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO;
 import com.logpm.warehouse.vo.WarehouseScanRecordVO;
 import com.logpm.warehouse.vo.WarehouseStockVO;
 import com.logpm.warehouse.wrapper.WarehouseStockVOWrapper;
@@ -83,7 +84,7 @@ public class WarehouseStockController extends BladeController {
 	}
 
 	/**
-	 * 备货扫描记录 自定义分页
+	 * 包件扫描记录 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -93,6 +94,28 @@ public class WarehouseStockController extends BladeController {
 		return R.data(WarehouseStockVOWrapper.build().pageVO(pages));
 	}
 
+	/**
+	 * 库存品扫描记录 自定义分页
+	 */
+	@GetMapping("/InventoryPage")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入WarehouseStock")
+	public R<IPage<WarehouseScanInventoryRecordVO>> InventoryPage(WarehouseScanInventoryRecordVO warehouseScanRecordVO, Query query) {
+		IPage<WarehouseScanInventoryRecordVO> pages = warehouseStockService.selectWarehouseStockInventoryPage(Condition.getPage(query), warehouseScanRecordVO);
+		return R.data(pages);
+	}
+
+	/**
+	 * 零担扫描记录 自定义分页
+	 */
+	@GetMapping("/ZreoPage")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入WarehouseStock")
+	public R<IPage<WarehouseScanRecordVO>> ZreoPage(WarehouseScanRecordVO warehouseScanRecordVO, Query query) {
+		IPage<WarehouseScanRecordVO> pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), warehouseScanRecordVO);
+		return R.data(WarehouseStockVOWrapper.build().pageVO(pages));
+	}
+
 	/**
 	 * 备货扫描记录 新增
 	 */

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.warehouse.entity.WarehouseStockEntity;
 import com.logpm.warehouse.excel.WarehouseStockExcel;
+import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO;
 import com.logpm.warehouse.vo.WarehouseScanRecordVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -51,5 +52,12 @@ public interface WarehouseStockMapper extends BaseMapper<WarehouseStockEntity> {
 	 * @return
 	 */
 	List<WarehouseStockExcel> exportWarehouseStock(@Param("ew") Wrapper<WarehouseStockEntity> queryWrapper);
-
+	/**
+	 * 库存品自定义分页
+	 *
+	 * @param page
+	 * @param warehouseScanRecordVO
+	 * @return
+	 */
+	List<WarehouseScanInventoryRecordVO> selectWarehouseStockInventoryPage(IPage<WarehouseScanInventoryRecordVO> page,@Param("param") WarehouseScanInventoryRecordVO warehouseScanRecordVO);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml

@@ -96,5 +96,8 @@
             </if>
         </where>
     </select>
+    <select id="selectWarehouseStockInventoryPage" resultType="com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO">
+
+    </select>
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.warehouse.entity.WarehouseStockEntity;
 import com.logpm.warehouse.excel.WarehouseStockExcel;
+import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO;
 import com.logpm.warehouse.vo.WarehouseScanRecordVO;
 import org.springblade.core.mp.base.BaseService;
 
@@ -50,4 +51,8 @@ public interface IWarehouseStockService extends BaseService<WarehouseStockEntity
 	 */
 	List<WarehouseStockExcel> exportWarehouseStock(Wrapper<WarehouseStockEntity> queryWrapper);
 
+	/**
+	 * 库存品扫描记录 自定义分页
+	 */
+    IPage<WarehouseScanInventoryRecordVO> selectWarehouseStockInventoryPage(IPage<WarehouseScanInventoryRecordVO> page, WarehouseScanInventoryRecordVO warehouseScanRecordVO);
 }

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

@@ -24,6 +24,7 @@ import com.logpm.warehouse.entity.WarehouseStockEntity;
 import com.logpm.warehouse.excel.WarehouseStockExcel;
 import com.logpm.warehouse.mapper.WarehouseStockMapper;
 import com.logpm.warehouse.service.IWarehouseStockService;
+import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO;
 import com.logpm.warehouse.vo.WarehouseScanRecordVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -49,12 +50,7 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 	@Override
 	public IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseScanRecordVO warehouseScanRecordVO) {
-		//获取当前登录人仓库
+		warehouseScanRecordVO.setWarehouseIdList(this.loginPerson());
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
-		List<Long> collect = myWatchWarehouse.stream()
-			.map(BasicdataWarehouseEntity::getId)
-			.collect(Collectors.toList());
-		warehouseScanRecordVO.setWarehouseIdList(collect);
 		List<WarehouseScanRecordVO> warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO);
 //		IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
 //		for (WarehouseScanRecordVO warehouseScanRecordVOData : warehouseScanRecordVOS) {
@@ -73,4 +69,18 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 		return WarehouseStockList;
 	}
 
+	@Override
+	public IPage<WarehouseScanInventoryRecordVO> selectWarehouseStockInventoryPage(IPage<WarehouseScanInventoryRecordVO> page, WarehouseScanInventoryRecordVO warehouseScanRecordVO) {
+		warehouseScanRecordVO.setWarehouseIdList(this.loginPerson());
+		List<WarehouseScanInventoryRecordVO> warehouseScanInventoryRecordVOList = baseMapper.selectWarehouseStockInventoryPage(page,warehouseScanRecordVO);
+		return page.setRecords(warehouseScanInventoryRecordVOList);
+	}
+	public List<Long> loginPerson(){
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		return myWatchWarehouse.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+	};
+
 }