Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java

@@ -38,7 +38,7 @@ public class LargeScreenQueryXxlJob {
 	/**
 	 * 数据查询
 	 */
-//	@XxlJob("largeScreenexExcute")
+	@XxlJob("largeScreenexExcute")
 	public ReturnT<String> largeScreenexExcute(String param) {
 		XxlJobQueryVO xxlJobQueryVO = new XxlJobQueryVO();
 		xxlJobQueryVO.setMapWarehouse(mapWarehouseService.list());

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java

@@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TrunkDataMapper {
 	public Integer getTotal(String startTime, String endTime);
-	public Integer getOnTheWay();
+	public Integer getOnTheWay(String startTime, String endTime);
 	public Integer getArrival(String startTime, String endTime);
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml

@@ -12,7 +12,8 @@
         select
             count(*)
         from logpm_platform.logpm_trunkline_cars_load
-        where load_status in ('10', '20', '30')
+        where   create_time between #{startTime} and #{endTime}
+          and load_status in ('10', '20', '30')
     </select>
     <select id="getArrival" resultType="java.lang.Integer">
         select

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/TrunkDataServiceImpl.java

@@ -27,7 +27,7 @@ public class TrunkDataServiceImpl implements ITrunkDataService {
 
 		TrunkDataVO trunkDataVO = new TrunkDataVO();
 		trunkDataVO.setTotal(trunkDataMapper.getTotal(startTime, endTime));
-		trunkDataVO.setOnTheWay(trunkDataMapper.getOnTheWay());
+		trunkDataVO.setOnTheWay(trunkDataMapper.getOnTheWay(startTime, endTime));
 		trunkDataVO.setArrival(trunkDataMapper.getArrival(startTime, endTime));
 
 		return trunkDataVO;

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

@@ -114,7 +114,7 @@ public class TripartiteTransferApiController {
 			}
 
 
-			return carsLoadService.transferUnloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车");
+			return carsLoadService.transferUnloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车",1);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@@ -138,7 +138,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R updateLoadScanFinalNodeIdById(LoadCarsDTO loadCarsDTO);
 
-	R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark);
+	R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark,Integer unloadType);
 
 	R transferUnloadZero(Long carsLoadScanId,Long loadId, String waybillNo, Integer enterNum, Long warehouseId, Integer unbindTray, String trayCode, String orderCode, String remark,List<ZeroPackageDTO> zeroPackageList);
 

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

@@ -6915,7 +6915,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark) {
+	public R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark,Integer unloadType) {
 		log.info("#############transferUnloadPackage: 三方中转卸车包件");
 
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@@ -6939,10 +6939,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //			return R.fail(405,"配载计划节点信息不存在");
 //		}
 
+		String unloadTypeStr = "";
+		if(unloadType == 1){
+			unloadTypeStr = "扫码";
+		}else if(unloadType == 2){
+			unloadTypeStr = "托盘";
+		}else if(unloadType == 3){
+			unloadTypeStr = "批量";
+		}
+
 		Long trayId = null;
 		String trayName = null;
 		String trayCode = null;
-		String content = "包件在 "+warehouseName+" 扫码 卸车，车次号："+loadCode+",由["+carrierName+"] 承运.";
+		String content = "包件在 "+warehouseName+" "+unloadTypeStr+" 卸车，车次号："+loadCode+",由["+carrierName+"] 承运.";
 
 		//判断包件是否已入库
 //		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
@@ -7086,7 +7095,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
 				distributionParcelListClient.updateOrderPackageCodeById(pacakageId, "60");
 
-				DownPackageTrayVO downPackageTrayVO = buildDownPackageTrayVO(orderPackageCode, wid, "中转卸车下架解托");
+				DownPackageTrayVO downPackageTrayVO = buildDownPackageTrayVO(orderPackageCode, wid, "三方中转卸车下架解托");
 				if(downPackageTrayVO!=null){
 					updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
 				}
@@ -7279,7 +7288,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String scanCode = carsLoadScanEntity.getScanCode();
 			if (type == 1) {
 				//包件
-				transferUnloadPackage(loadId, scanCode, warehouseId, 0, "三方中转托盘正常卸车");
+				transferUnloadPackage(loadId, scanCode, warehouseId, 0, "三方中转托盘正常卸车",2);
 			} else if (type == 2) {
 				String waybillNo = carsLoadScanEntity.getWaybillNo();
 				Integer num = carsLoadScanEntity.getNum();
@@ -7301,7 +7310,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		//处理托盘的入库和货物的入库
-		trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId);
+		trayTypeClient.trayToNull(trayCode,"三方中转托盘卸车");
 
 		JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId);
 		Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum");
@@ -7894,7 +7903,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		for (UnloadPackageDTO unloadPackageDTO : unloadPackageList) {
 			String orderPackageCode = unloadPackageDTO.getOrderPackageCode();
-			transferUnloadPackage(loadId, orderPackageCode, warehouseId, 1, "批量卸车包件正常卸车");
+			transferUnloadPackage(loadId, orderPackageCode, warehouseId, 1, "批量卸车包件正常卸车",3);
 		}
 
 
@@ -8492,6 +8501,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				//更新包件状态
 				distributionParcelListClient.updateOrderPackageCodeById(parcelListEntity.getId(), "70");
 
+				DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+				downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+				downPackageTrayVO.setWarehouseId(parcelListEntity.getWarehouseId());
+				downPackageTrayVO.setRemark("直发商家异常签收下架解托");
+				updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+
 				//无装车记录异常日志记录
 				try {
 					carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseEntity.getName(), loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
@@ -8566,6 +8581,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			//生成签收记录
 			trunklineCarsSignLogService.addEntity(carsLoadScanEntity, remark);
+
+
+			DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+			downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+			downPackageTrayVO.setWarehouseId(parcelListEntity.getWarehouseId());
+			downPackageTrayVO.setRemark("直发商家签收下架解托");
+			updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+
 		}
 
 		//重新计算数量
@@ -8927,6 +8950,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				scanZeroDetailService.updateBatchById(updateZerpPackageList);
 			}
 
+			orderPackageCodes.forEach(orderPackageCode -> {
+				DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+				downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+				downPackageTrayVO.setWarehouseId(warehouseId);
+				downPackageTrayVO.setRemark("PC批量签收下架解托");
+				updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+			});
+
+
 			//生成签收记录
 			trunklineCarsSignLogService.addList(updateCarsLoadScanList, "PC批量签收");