Merge branch 'pre-production'

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

@@ -31,6 +31,7 @@ import com.logpm.distribution.excel.DistributionSignforOwnExcel;
 import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.*;
 import com.logpm.oldproject.dto.SignPushDataUnitDTO;
+import com.logpm.trunkline.dto.WaybillLogDTO;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.secure.BladeUser;
 
@@ -411,5 +412,10 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	List<SignPushDataUnitDTO> selectPushOldSingleInventoryPackageSigning(@Param("reservationId")Long reservationId,@Param("deliveryId") Long deliveryId,@Param("orderPackageCode") String orderPackageCode);
 
 
-
+	/**
+	 * 查询签收结果数据
+	 * @param reservationId
+	 * @return
+	 */
+	List<WaybillLogDTO> getWaybillSignforData(@Param("reservationId")Long reservationId,@Param("userId")Long userId,@Param("userName")String userName);
 }

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

@@ -1794,4 +1794,74 @@
         AND ldl.is_deleted = 0
         AND ldl.signfor_state = 2
     </select>
+    <select id="getWaybillSignforData" resultType="com.logpm.trunkline.dto.WaybillLogDTO">
+        SELECT
+        t.waybillNo AS waybillNo,
+        IFNULL( sum( t.num ), 0 ) AS num,
+        GROUP_CONCAT(DISTINCT t.warehouseId ) AS warehouseId,
+        GROUP_CONCAT(DISTINCT t.warehouseName ) AS warehouseName,
+        GROUP_CONCAT(DISTINCT t.trainNumber ) AS trainNumber,
+        GROUP_CONCAT(DISTINCT t.driverName ) AS driverName,
+        GROUP_CONCAT(DISTINCT t.carNumber ) AS carNumber,
+        GROUP_CONCAT(DISTINCT t.deliveryTime ) AS deliveryTime,
+        now() AS signTime,
+        GROUP_CONCAT(DISTINCT t.loadingUser ) AS loadingUser,
+        GROUP_CONCAT(DISTINCT t.signUser ) AS signUser,
+        GROUP_CONCAT(DISTINCT t.signOrderCode) AS signOrderCode,
+        3 AS type,
+        #{userId} AS userId,
+        #{userName} AS nickName
+        FROM
+        (
+        SELECT
+        ldpl.waybill_number AS waybillNo,
+        ldl.package_nub AS num,
+        lds.warehouse_id AS warehouseId,
+        lds.warehouse_name AS warehouseName,
+        lddl.train_number AS trainNumber,
+        lddl.driver_name AS driverName,
+        lddl.vehicle_name AS carNumber,
+        lds.sjsigning_time AS deliveryTime,
+        lds.signing_time AS signTime,
+        ldl.scan_user AS loadingUser,
+        ldl.signing_user AS signUser,
+        ldr.reservation_code AS signOrderCode
+        FROM
+        logpm_distribution_signfor AS lds
+        LEFT JOIN logpm_distribution_loadscan AS ldl ON lds.reservation_id = ldl.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id
+        LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id
+        LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+        WHERE
+        lds.reservation_id = #{reservationId}
+        AND lds.driver_signing = 2
+        AND ldl.scan_status != 1 UNION ALL
+        SELECT
+        ldpl.waybill_number AS waybillNo,
+        ldl.package_nub AS num,
+        lds.warehouse_id AS warehouseId,
+        lds.warehouse_name AS warehouseName,
+        lddl.train_number AS trainNumber,
+        lddl.driver_name AS driverName,
+        lddl.vehicle_name AS carNumber,
+        lds.sjsigning_time AS deliveryTime,
+        lds.signing_time AS signTime,
+        ldl.scan_user AS loadingUser,
+        ldl.signing_user AS signUser,
+        ldr.reservation_code AS signOrderCode
+        FROM
+        logpm_distribution_signfor AS lds
+        LEFT JOIN logpm_distribution_loadscaninvn AS ldl ON lds.reservation_id = ldl.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldl.order_package_code
+        LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id
+        LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+        WHERE
+        lds.reservation_id = #{reservationId}
+        AND lds.driver_signing = 2
+        AND ldl.scan_status != 1
+        AND ldpl.waybill_number IS NOT NULL
+        ) AS t
+        GROUP BY
+        t.waybillNo
+    </select>
 </mapper>

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

@@ -7410,7 +7410,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -7435,7 +7435,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);

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

@@ -523,9 +523,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			log.error("参数错误+{" + distributionReservationDTO + "}");
 			return R.status(false);
 		}
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) {
 			// 获取商场的仓库
-			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 			distributionReservationDTO.setWarehouseId(myCurrentWarehouse.getId());
 			distributionReservationDTO.setWarehouseName(myCurrentWarehouse.getName());
 			if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) {
@@ -534,19 +534,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			}
 
 		}
-
-
-		//
-
-//		if (Func.isEmpty(distributionReservationDTO.getWarehouseName())){
-//			log.error("WarehouseName参数错误+{" + distributionReservationDTO.getWarehouseName() + "}");
-//			return R.status(false);
-//		}
-//		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-//		if (Func.isEmpty(myCurrentWarehouse)) {
-//			return R.fail("无仓库信息!!!");
-//		}
-
 		//构建预约单
 		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
 		Func.copy(distributionReservationDTO, reservationEntity);
@@ -958,7 +945,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -982,7 +969,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -1007,7 +994,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -1031,7 +1018,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -1251,7 +1238,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//这里站配送任务主要有两个方面
 		//1、针对市配订单需要将预约信息填充至配送计划中
 		//2、商配跳过预约阶段直接将订单信息和配送计划进行关联
-		if (Func.isEmpty(allocationDTO)) {
+		if (Objects.isNull(allocationDTO)) {
 			log.error("参数异常allocationDTO:+{" + allocationDTO + "}");
 			return R.fail("服务器正忙!!!");
 		}
@@ -1289,7 +1276,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//司机名称拼接
 		StringBuilder driverNames = new StringBuilder();
 		//查询根据预约ID查询这些预约的备货状态
-		List<DistributionReservationEntity> reservationEntityList = baseMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda().eq(DistributionReservationEntity::getId, ids));
+		List<DistributionReservationEntity> reservationEntityList = baseMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda()
+			.in(DistributionReservationEntity::getId, ids)
+		);
 		//判断是否存在预约进行了配送任务的提交
 		boolean match = reservationEntityList.stream().anyMatch(r -> ReservationStatusConstant.daipeisong.getValue().equals(r.getReservationStatus()));
 		if (match) {
@@ -1322,11 +1311,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				continue;
 			}
 			if (Func.equals(reservationEntity.getStockupStatus(), ReservationStockupStatusConstant.weibeihuo.getValue())) {
-				//如果预约已经备货
+				//如果预约未进行备货
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 				stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
 				stockupInfoEntity.setReservationId(ids.get(i));
-				stockupInfoEntity.setStockupId(stockupEntity.getId());
+				if(stockupEntity!=null){
+					stockupInfoEntity.setStockupId(stockupEntity.getId());
+				}
 				distributionStockupInfoService.save(stockupInfoEntity);
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 			}

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

@@ -56,6 +56,8 @@ import com.logpm.oldproject.feign.IOldSignPushClient;
 import com.logpm.oldproject.feign.IWarehouseClient;
 import com.logpm.trunkline.dto.WaybillLogDTO;
 import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
+import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient;
+import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownStockUpAreaClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import lombok.extern.slf4j.Slf4j;
@@ -246,6 +248,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
 
+	@Autowired
+	private ITrunklineWaybillTrackClient trunklineWaybillTrackClient;
+
 	@Autowired
 	private IDistributionNodeWorkService iDistributionNodeWorkService;
 
@@ -6289,14 +6294,36 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		log.info(">>>> updateSign isSuccess ={}", isSuccess);
 		buildArgsToPushMq(distributionSignfor);
 		if (isSuccess) {
+			//整理签收数据回退干线
+			handletrunklineWaybillSignLog(distributionSignfor.getReservationId());
+
+
+
+
+
+
 			this.updateById(distributionSignfor);
 			// 创建异步队列推送老系统的的签收信息 构建请求参数
 			return R.status(true);
 		}
-		WaybillLogDTO waybillLogDTO = new WaybillLogDTO();
-
 		return R.status(false);
 
+	}
+
+	/**
+	 * 推送干线运单信息
+	 * @param reservationId
+	 */
+	private void handletrunklineWaybillSignLog(Long reservationId) {
+		List<WaybillLogDTO> mapList = baseMapper.getWaybillSignforData(reservationId,AuthUtil.getUser().getUserId(),AuthUtil.getUser().getNickName());
+		if (!mapList.isEmpty()) {
+			for (WaybillLogDTO waybillLogDTO : mapList) {
+				trunklineWaybillTrackClient.addSignWaybillLog(waybillLogDTO);
+			}
+		}
+
+
+
 	}
 
 	/**

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

@@ -1760,7 +1760,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}
 
 		String deptId = AuthUtil.getDeptId();
-		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByDepartment(deptId);
+		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
 
 		List<String> ls = new ArrayList<>();
 		for (int i = 0; i < packageNum; i++) {