Merge branch 'pre-production'

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java

@@ -40,6 +40,7 @@ public interface IDistributionSignforClient {
     String API_PREFIX = "signfor/client";
     String TOP = API_PREFIX + "/top";
     String CLERKCHECKPUSHDATA = API_PREFIX + "/clerkCheckPushData";
+    String CLERKINVENTORYCHECKDATA = API_PREFIX + "/clerkInventoryCheckPushData";
 
     /**
      * 获取签收管理列表
@@ -64,4 +65,15 @@ public interface IDistributionSignforClient {
 	 */
 	@GetMapping(CLERKCHECKPUSHDATA)
 	Map<String,Object> clerkCheckPushData(@RequestParam("id") Long id);
+
+
+	/**
+	 * 推送老系统零担信息
+	 * @param params
+	 * @return
+	 */
+	@GetMapping(CLERKINVENTORYCHECKDATA)
+	Map<String, Object> clerkInventoryCheckPushData(@RequestParam("orderPackageCode")String orderPackageCode);
+
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.feign.IBasicdataTripartiteWarehouseClient;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.*;
+import com.logpm.distribution.service.IDistributionLoadscaninvnService;
 import com.logpm.distribution.service.IDistributionSignforService;
 import com.logpm.distribution.service.IDistributionStockService;
 import com.logpm.distribution.vo.DistributionSignPrintVO;
@@ -34,6 +35,7 @@ import com.logpm.oldproject.feign.IWarehouseClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RedisKeyConstant;
+import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -73,6 +75,7 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 	private final DistributionSignforMapper distributionSignforMapper;
 	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
 	private final DistributionReservationMapper distributionReservationMapper;
+	private final IDistributionLoadscaninvnService distributionLoadscaninvnService;
 
 	private final DistributionDeliverySelfMapper distributionDeliverySelfMapper;
 
@@ -116,6 +119,19 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 
 	}
 
+	@Override
+	public Map<String, Object> clerkInventoryCheckPushData(String orderPackageCode) {
+
+
+
+
+
+
+
+		return distributionSignforService.clerkInventoryCheckPushData(orderPackageCode);
+	}
+
+
 	private void buildNameAndPhone(List<SignPushDataUnitDTO> pushOldPackageSigning) {
 		for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) {
 			User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getAdministratorsId());

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

@@ -52,7 +52,7 @@
         dbl.total_cost AS totalCost,
         dbl.pick_up_plate AS pickUpPlate,
         dbl.pickup_batch AS pickupBatch,
-        ( SELECT IFNULL(SUM(quantity),0 FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum,
+        ( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum,
         (
         SELECT
         group_concat( splice )

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -368,4 +368,12 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	List<DistributionAddvaluePackageDTO> checkAddValuePCPackageList(Long reservationId);
+
+
+	/**
+	 * 推送库存品包件
+	 * @param orderPackageCode
+	 * @return
+	 */
+	Map<String, Object> clerkInventoryCheckPushData(String orderPackageCode);
 }

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

@@ -6557,10 +6557,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						List<SignPushDataUnitDTO> pushOldPackageLoading = distributionSignforMapper.selectPushOldPackageLoading(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
 						List<SignPushDataUnitDTO> pushOldPackageSigning = distributionSignforMapper.selectPushOldPackageSigning(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
 						if (Func.isNotEmpty(pushOldPackageLoading)) {
+							pushOldPackageLoading = handleSignPushDataUnitDTOList(pushOldPackageLoading);
 							buildNameAndPhone(pushOldPackageLoading);
 							signPushDataUnitDTOS.addAll(pushOldPackageLoading);
 						}
 						if (Func.isNotEmpty(pushOldPackageSigning)) {
+							pushOldPackageLoading = handleSignPushDataUnitDTOList(pushOldPackageSigning);
 							buildNameAndPhone(pushOldPackageSigning);
 							signPushDataUnitDTOS.addAll(pushOldPackageSigning);
 						}
@@ -6615,6 +6617,28 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	}
 
+	private List<SignPushDataUnitDTO> handleSignPushDataUnitDTOList(List<SignPushDataUnitDTO> pushOldPackageLoading) {
+		pushOldPackageLoading.stream().forEach(k->{
+			if (k.getGoods_type() == 3){
+				String unitNo = k.getUnitNo();
+				int indexOfUnitNo = unitNo.lastIndexOf("-");
+				if (indexOfUnitNo>0){
+					unitNo.substring(indexOfUnitNo);
+					k.setUnitNo(unitNo);
+				}
+				String orderSelfNum = k.getOrderSelfNum();
+				int indexOfOrderSelfNum = orderSelfNum.lastIndexOf("-");
+				if (indexOfUnitNo>0){
+					orderSelfNum.substring(indexOfUnitNo);
+					k.setOrderSelfNum(orderSelfNum);
+				}
+			}
+		});
+
+
+		return pushOldPackageLoading;
+	}
+
 	@Override
 	public DistributionSignforExcelDTO distributionSignforDetailExcel(Long id) {
 		DistributionSignforExcelDTO distributionSignforExcelDTO = new DistributionSignforExcelDTO();
@@ -6779,6 +6803,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return list;
 	}
 
+
+	@Override
+	public Map<String, Object> clerkInventoryCheckPushData(String orderPackageCode) {
+		//查询此包件
+		List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
+			.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, orderPackageCode)
+			.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
+		if (!loadscaninvnEntityList.isEmpty()) {
+			//未进行装车
+		}
+		if (loadscaninvnEntityList.size()>1) {
+			//存在多个记录
+		}
+		DistributionLoadscaninvnEntity loadscaninvnEntity = loadscaninvnEntityList.get(0);
+
+
+
+
+		return null;
+
+	}
+
 	private void buildNameAndPhone(List<SignPushDataUnitDTO> pushOldPackageSigning) {
 		for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) {
 			User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getAdministratorsId());

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -241,6 +241,32 @@ public class DistributionDatarepair {
 		return ReturnT.SUCCESS;
 	}
 
+	/**
+	 * 转库存品包件推送老系统
+	 *订单自编号
+	 * @return
+	 */
+	@XxlJob("pushInventorySingleNotification")
+	public ReturnT<String> pushInventorySingleNotification(String params) {
+		Map<String, Object> map = distributionSignforClient.clerkInventoryCheckPushData(params);
+		Long id = Long.parseLong(params);
+		Boolean b = (Boolean) map.get("result");
+		log.info(">>> 推送反馈信息  map :{}",map);
+		if (b != null && b) {
+			warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1);
+			log.info(">>> 推送成功 {}", Long.parseLong(params));
+		} else {
+			String remarks = (String) map.get("msg");
+			warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks);
+			log.error(">>> 推送失败 id=" + Long.parseLong(params));
+		}
+		return ReturnT.SUCCESS;
+	}
+
+
+
+
+
 	/**
 	 * 推送自提签收老系统系统
 	 *

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

@@ -196,7 +196,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 		trainCustomQuery(query, queryWrapper);
 		// 仓库权限
 		ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient);
-		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",2000L, ReportExcelUtil.SHEETDATANUM);
+		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",1000L, ReportExcelUtil.SHEETDATANUM);
 	}
 
 	@Override

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

@@ -472,6 +472,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				}
 				//存入零担订单包件数量
 				distributionParcelNumberClient.addBatch(parcelNumberList);
+				//TODO  日志增加
 			}
 		}
 		distributionStockArticleClient.submitHandleNumAndTotalNumberByOrderId(subNum, articleId);