Merge branch 'pre-production'

blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java

@@ -150,6 +150,16 @@ public class PackageData implements Serializable {
 	private String signUser;//签收人
 
 
+	/**
+	 * 装车人
+	 */
+	private String loadingUserName;
+
+
+
+
+
+
 	private Long finalNodeId;
 	private String finalNodeName;
 

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

@@ -323,6 +323,6 @@ public interface IDistributionParcelListClient {
 	List<String> findSignOrderPackageCodes(@RequestBody List<String> orderPackageCodes);
 
 	@PostMapping(API_PREFIX + "/findListZhaoBuDaoYuanYin")
-	List<DistributionParcelListEntity> findListZhaoBuDaoYuanYin(FindParamterDTO findParamterD);
+	List<DistributionParcelListEntity> findListZhaoBuDaoYuanYin(@RequestBody FindParamterDTO findParamterD);
 }
 

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

@@ -24,4 +24,10 @@ public interface ITrunklineCarsLoadClient {
 
 	@GetMapping(API_PREFIX+"/saveCostShareRecord")
     void saveCostShareRecord(@RequestParam Long loadId);
+
+	@GetMapping(API_PREFIX+"/dealWaybillCancleCheck")
+	void dealWaybillCancleCheck(@RequestParam String waybillNo);
+
+	@GetMapping(API_PREFIX+"/dealWaybillCheck")
+	void dealWaybillCheck(@RequestParam String waybillNo);
 }

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

@@ -702,18 +702,26 @@ public class DistributionStockupAppController extends BladeController {
 
 			//判断扫描的包件是否可以继续进行该预约的库存品备货
 			int isStockUp = judgmentIsStockUp(stockupDTO.getReservationId(), stockupDTO.getStockListId(), distributionParcelListEntity, myCurrentWarehouse.getId(), stockupDTO.getCargoNumber());
-			DistributionStockListEntity distributionStockListEntities = distributionStockupService.selectStockListInfoByCargoNumberList(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(), stockupDTO.getPacketBarCode());
 			switch (isStockUp) {
 				case 1:
 					return Resp.scanFail(60008, "包件不属于此计划!!!", "包件不属于此计划!!!", "");
 				case 2:
-					return R.data(60002, distributionStockListEntities.getId(), "当前包件批次号与入库批次号不符，是否确认修改计划批次");
+					DistributionStockListEntity distributionStockListEntities = distributionStockupService.selectStockListInfoByCargoNumberList(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(), stockupDTO.getPacketBarCode());
+					if (Objects.isNull(distributionStockListEntities)){
+						return Resp.scanFail("库存品数据错误","库存品数据错误");
+					}else {
+						return R.data(60002, distributionStockListEntities.getId(), "当前包件批次号与入库批次号不符，是否确认修改计划批次");
+					}
 //				case 3:
 //					//查询其他所用的页面信息
 //					DistributionStockupStockListVO distributionStockupStockListVO = distributionReservationService.selectStockupStockListByStockListId(reservationId,distributionStockListEntities.getId());
 //					return R.data(200, distributionStockupStockListVO, "扫描成功！");
 				case 3:
-					return R.data(200, distributionStockListEntities.getId(), "扫描成功！");
+					DistributionStockListEntity list = distributionStockupService.selectStockListInfoByCargoNumberList(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(), stockupDTO.getPacketBarCode());
+					if (Objects.isNull(list)){
+						return Resp.scanFail("库存品数据错误","库存品数据错误");
+					}
+					return R.data(200, list.getId(), "扫描成功！");
 			}
 		}
 		return R.data(200, "", "扫描成功！");

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java

@@ -43,7 +43,7 @@ public class MyExcelUtil extends ExcelUtil {
 					//进行是否零担的区分
 					Map<String, List<DistributionStockupPackageListDetailExcel>> isZeroMap = v.stream().collect(Collectors.groupingBy(DistributionStockupPackageListDetailExcel::getIsZero));
 					isZeroMap.forEach((m,n)->{
-						if (m.equals("0")){
+						if ("0".equals(m)){
 							//订制品
 							WriteSheet writeSheet = EasyExcel.writerSheet(1,"订制品备货清单").head(DistributionStockupPackageListDetailExcel.class).build();
 							excelWriter.write(n, writeSheet);

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

@@ -682,9 +682,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	@Override
 	public List<DistributionParcelListEntity> findListZhaoBuDaoYuanYin(FindParamterDTO findParamterD) {
 		log.info("###################findListZhaoBuDaoYuanYin: 当前处理的订单数据 {}",findParamterD);
-		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.in("order_code", findParamterD.getOrderCodeSet())
-			.eq("warehouse_id", findParamterD.getWarehouseId());
+		LambdaQueryWrapper<DistributionParcelListEntity> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(DistributionParcelListEntity::getOrderCode, findParamterD.getOrderCodeSet())
+			.eq(DistributionParcelListEntity::getWarehouseId, findParamterD.getWarehouseId());
 
 		return distributionParcelListService.list(queryWrapper);
 	}

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

@@ -627,43 +627,53 @@
 
     </select>
     <select id="selectStockupSelf" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">
-                select lddd.stock_list_id                        stockListId,
-                concat(ifnull(t1.allocation_ids,''),if(t1.allocation_ids is not null,',',''), ifnull(t2.allocation_ids,'')) as allocations,
-               ldsl.description_goods                    materialName,
-               ldsl.sku                                  sku,
-               ldsl.cargo_norms                          cargoNorms,
-               ldsl.cargo_number                         cargoNumber,
-               lddd.quantity                             planNum,
-               ldsl.cargo_unit                           cargoUnit,
-               ldsl.tray_name                            trayName,
-                ldsl.unpack                               unpack,
-               ldsl.source_type                               sourceType,
-               (
-                   select COUNT(id)
-                   from logpm_dis_stock_list_detail
-                   where reservation_id = lddd.bill_lading_id  and stock_package_code is NOT null AND stock_list_id = lddd.stock_list_id
-        )                                         realNum,
-               lddd.id                                   deliveryDetailsId
-        from logpm_distribution_delivery_details lddd
-                 LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id and ldsl.quantity_stock !=0
-        LEFT JOIN ( SELECT association_value,warehouse_id, GROUP_CONCAT( DISTINCT ( allocation_id )) AS allocation_ids FROM logpm_warehouse_updown_goods   WHERE association_type = 4 GROUP BY association_value,warehouse_id ) AS t2 ON ldsl.cargo_number = t2.association_value and ldsl.warehouse_id=t2.warehouse_id
-        LEFT JOIN (  SELECT
+        SELECT
+        lddd.stock_list_id stockListId,
+        concat(
+        ifnull( t1.allocation_ids, '' ),
+        IF
+        ( t1.allocation_ids IS NOT NULL, ',', '' ),
+        ifnull( t2.allocation_ids, '' )) AS allocations,
+        ldsl.description_goods materialName,
+        ldsl.sku sku,
+        ldsl.cargo_norms cargoNorms,
+        ldsl.cargo_number cargoNumber,
+        lddd.quantity planNum,
+        ldsl.cargo_unit cargoUnit,
+        ldsl.tray_name trayName,
+        ldsl.unpack unpack,
+        ldsl.source_type sourceType,
+        ( SELECT COUNT( id ) FROM logpm_dis_stock_list_detail WHERE reservation_id = lddd.bill_lading_id AND stock_package_code IS NOT NULL AND stock_list_id = lddd.stock_list_id ) realNum,
+        lddd.id deliveryDetailsId
+        FROM
+        logpm_distribution_delivery_details lddd
+        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON lddd.bill_lading_id = ldbl.id
+        LEFT JOIN logpm_distribution_stock_list ldsl ON lddd.stock_list_id = ldsl.id
+        AND ldsl.quantity_stock != 0
+        LEFT JOIN ( SELECT association_value, warehouse_id, GROUP_CONCAT( DISTINCT ( allocation_id )) AS allocation_ids,market_name FROM logpm_warehouse_updown_goods WHERE association_type = 4 GROUP BY association_value, warehouse_id,market_name ) AS t2 ON ldsl.cargo_number = t2.association_value AND t2.market_name = ldbl.consignee_unit
+        AND ldsl.warehouse_id = t2.warehouse_id
+        LEFT JOIN (
+        SELECT
         ldpl.material_code,
         ldpl.warehouse_id,
-        GROUP_CONCAT( DISTINCT ( lwug.allocation_id ) ) AS allocation_ids
+        GROUP_CONCAT( DISTINCT ( lwug.allocation_id ) ) AS allocation_ids,
+        ldsa.mall_name
         FROM
         logpm_warehouse_updown_goods lwug
         LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = lwug.association_id
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldpl.stock_article_id = ldsa.id
         WHERE
         lwug.association_type != 4
         AND ldpl.conditions = 2
-
-        GROUP BY ldpl.material_code,ldpl.warehouse_id ) AS t1 ON ldsl.cargo_number = t1.material_code and ldsl.warehouse_id=t1.warehouse_id
-
-        where lddd.bill_lading_id = #{reservationId}
-        GROUP BY lddd.stock_list_id, ldsl.description_goods, ldsl.sku, ldsl.cargo_norms, lddd.quantity, ldsl.cargo_unit,
-                 ldsl.tray_name, ldsl.source_type,ldsl.unpack,lddd.id
-
+        GROUP BY
+        ldpl.material_code,
+        ldpl.warehouse_id
+        ) AS t1 ON ldsl.cargo_number = t1.material_code AND t1.mall_name = ldbl.consignee_unit
+        AND ldsl.warehouse_id = t1.warehouse_id
+        WHERE
+        lddd.bill_lading_id = #{reservationId}
+        GROUP BY
+        ldsl.sku
     </select>
     <select id="selectStockupDetailsZero" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
         select lds.stockup_area            goodsAreaName,

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

@@ -906,7 +906,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.STOCK_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
 		String tenantCode = "BH";
 		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
-			log.error("获取货区码失败");
+			log.warn(" bianMa 获取货区码失败");
 		} else {
 			tenantCode = basicTenantCodeByCodeAndShowType.getCode();
 		}
@@ -937,7 +937,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.APPOINTMENT_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
 		String tenantCode = "YY";
 		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
-			log.error("获取货区码失败");
+			log.warn(" reservationMa 获取货区码失败");
 		} else {
 			tenantCode = basicTenantCodeByCodeAndShowType.getCode();
 		}
@@ -968,7 +968,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.APPOINTMENT_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
 		String tenantCode = "HK";
 		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
-			log.error("获取货区码失败");
+			log.warn("retentionMa 获取货区码失败");
 		} else {
 			tenantCode = basicTenantCodeByCodeAndShowType.getCode();
 		}
@@ -1023,7 +1023,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		String tenantCode = "PSCC";
 		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.DELIVERY_PLAN_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
 		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
-			log.error("获取货区码失败");
+			log.warn(" trainNumberMa 获取货区码失败");
 		} else {
 			tenantCode = basicTenantCodeByCodeAndShowType.getCode();
 		}

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

@@ -814,6 +814,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			PackageData packageData = new PackageData();
 			packageData.setSignTime(org.springblade.core.tool.utils.DateUtil.parse(distributionLoadscanEntity.getSigningTime(),"yyyy-MM-dd hh:mm:ss"));
 			packageData.setSignUser(distributionLoadscanEntity.getSigningUser());
+			// 增加装车扫描人
+			packageData.setLoadingUserName(distributionLoadscanEntity.getScanUser());
 			// 不是零担
 			if (distributionLoadscanEntity.getIsZero() == null || distributionLoadscanEntity.getIsZero() == 0) {
 				packageData.setPackageCode(distributionLoadscanEntity.getOrderPackageCode());
@@ -9015,11 +9017,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user,driver);
 			log.info("driverName>>>>>>>>>>>>>:{}", deliverySelfEntity.getDriverName());
 
-			if (Objects.isNull(deliverySelfEntity)) {
-
-				return Resp.scanFail("当前人无操作权限", "当前人无操作权限");
-			}
-			//针对之前该司机上传的图片进行全部删除
+            //针对之前该司机上传的图片进行全部删除
 			//查询该司机已有的图片信息
 			List<DistributionSignPrintEntity> list = iDistributionSignPrintService.list(Wrappers.<DistributionSignPrintEntity>query().lambda()
 				.eq(DistributionSignPrintEntity::getReservationId, signforEntity.getReservationId())

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

@@ -3768,6 +3768,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
+	@Transactional
 	public R stockupScanByCustom(StockupDTO stockupDTO) {
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		//包件扫描
@@ -3780,10 +3781,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			log.warn("##################stockupScan: 未选择仓库，订单自编号为空");
 			return R.fail(403, "未授权!!");
 		}
-		if (StringUtil.isBlank(orderCode)) {
-			log.warn("##################stockupScan: 包件扫码，订单自编号为空");
-			return R.fail("包件扫码:订单自编号不能为空");
-		}
+//		if (StringUtil.isBlank(orderCode)) {
+//			log.warn("##################stockupScan: 包件扫码，订单自编号为空");
+//			return R.fail("包件扫码:订单自编号不能为空");
+//		}
 		if (StringUtil.isBlank(packetBarCode)) {
 			log.warn("##################stockupScan: 包件扫码，包件码为空");
 			return R.fail("包件扫码:包件码不能为空");
@@ -3813,7 +3814,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				DistributionParcelListEntity one = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()
 					.eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode())
 					.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+					.eq(DistributionParcelListEntity::getConditions, 1)
 				);
+				if (Objects.isNull(one)){
+					throw new ServiceException("系统无此订制品包件!!!");
+				}
 				entity.setOrderSelfNumbering(one.getOrderCode());
 				entity.setStockArticle(one.getStockArticleId());
 				entity.setCoding(packetBarCode);
@@ -3841,7 +3846,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					}
 					entity.setAllocationId(stockupDTO.getAllocationId());
 				}
-				entity.setConditions("0");
+				entity.setConditions("1");
 				entity.setType(1);
 				entity.setOutboundType(distributionStockupEntity.getTypeService());
 				//修改订单备货状态
@@ -3965,10 +3970,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			log.warn("##################stockupScan: 库存品扫码，备货区为空");
 			return R.fail("库存品扫码:备货任务ID不能为空");
 		}
-//		if (Objects.isNull(stockListId)) {
-//			log.warn("##################stockupScan: 库存品扫码，库存品id为空");
-//			return R.fail("库存品扫码:库存品id不能为空");
-//		}
 		if (Objects.isNull(reservationId)) {
 			log.warn("##################stockupScan: 库存品扫码，预约单id为空");
 			return R.fail("库存品扫码:预约单id不能为空");
@@ -3985,6 +3986,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		DistributionStockListEntity byId = null;
 //		if (ObjectUtils.isNull(stockListId)) {
 		// 通过扫码的二维码 查询其对应的库存存信息
+
+
+
+
+
+
+
+
 		if (stockupDTO.getStockPrint() == 1) {
 			//1 原有包条
 			byId = distributionStockListService.selectStockInforByOrderPackageCode(stockupDTO.getPacketBarCode());
@@ -4670,8 +4679,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		ddd.setInventoryStatus(ReservationOrderStatusConstant.zengjia.getValue());
 		ddd.setBillLadingId(stockupDTO.getReservationId());
 		ddd.setRealityQuantity(0);
+		ddd.setQuantity(1);
 		ddd.setConditions("10");
 		ddd.setStockStatus("1");
+		ddd.setStartTimeStocking(new Date());
 		ddd.setStockListId(byId.getId());
 		return ddd;
 	}

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

@@ -4176,6 +4176,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			PackageData packageData = new PackageData();
 			packageData.setSignUser(t.getScanUser());
 			packageData.setSignTime(t.getCreateTime());
+			packageData.setLoadingUserName(t.getScanUser());
 			if ("1".equals(t.getMaterialType())) {
 				// 库存
 				Long stockListId = t.getStockListId();
@@ -5023,7 +5024,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		String tenantCode = "ZT";
 		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.DELIVERY_PLAN_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
 		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
-			log.error("获取货区码失败");
+			log.warn(" billMa 获取货区码失败");
 		} else {
 			tenantCode = basicTenantCodeByCodeAndShowType.getCode();
 		}

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

@@ -1371,5 +1371,31 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("dealWaybillCheck")
+	public ReturnT<String>  dealWaybillCheck(String param) {
+		log.info("############dealWaybillCheck: 处理运单重新审核   开始");
+
+		List<JSONObject> ls = warehouseMappingDataService.findAllDealWithWaybillNo();
+
+		ls.forEach(json -> {
+			Integer id = json.getInt("id");
+			String waybillNo = json.getStr("waybillNo");
+
+			log.info("###################dealWaybillCheck: 当前处理的运单为 waybillNo={}",waybillNo);
+
+			carsLoadClient.dealWaybillCancleCheck(waybillNo);
+			carsLoadClient.dealWaybillCheck(waybillNo);
+
+			warehouseMappingDataService.updateStatusDealwithWaybillById(id);
+		});
+
+
+		log.info("############dealWaybillCheck: 处理运单重新审核  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
+
+
 }
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadClient.java

@@ -2,6 +2,7 @@ package com.logpm.trunkline.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
+import com.logpm.trunkline.service.IOpenOrderService;
 import com.logpm.trunkline.service.ITrunklineCarsLoadService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class TrunklineCarsLoadClient implements ITrunklineCarsLoadClient{
 
 	private final ITrunklineCarsLoadService carsLoadService;
+	private final IOpenOrderService openOrderService;
 
 	@Override
 	public TrunklineCarsLoadEntity findEntityByCarsNo(String carsNo) {
@@ -35,4 +37,15 @@ public class TrunklineCarsLoadClient implements ITrunklineCarsLoadClient{
 	public void saveCostShareRecord(Long loadId) {
 		carsLoadService.saveCostShareRecord(loadId);
 	}
+
+	@Override
+	public void dealWaybillCancleCheck(String waybillNo) {
+
+		openOrderService.patchCancleCheckWaybill(waybillNo);
+	}
+
+	@Override
+	public void dealWaybillCheck(String waybillNo) {
+		openOrderService.patchCheckWaybill(waybillNo);
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/report/AdvanceDetailDealListener.java

@@ -327,6 +327,8 @@ public class AdvanceDetailDealListener {
 				ReportPackageBasicEntity reportPackageBasicEntity = new ReportPackageBasicEntity();
 				reportPackageBasicEntity.setWaybillNo(waybill.getWaybillNo());
 				reportPackageBasicEntity.setOrderCode(waybill.getWaybillNo());
+				reportPackageBasicEntity.setProductId(detail.getProductId());
+				reportPackageBasicEntity.setProductName(detail.getProductName());
 				reportPackageBasicEntity.setNum(detail.getNum());
 				reportPackageBasicEntity.setWeight(detail.getWeight());
 				reportPackageBasicEntity.setVolume(detail.getVolume());
@@ -450,7 +452,7 @@ public class AdvanceDetailDealListener {
 			reportPackageBasicEntity.setSystemType(entity.getSystemType());
 			reportPackageBasicEntity.setCustomerTrain(entity.getCustomerTrain());
 			reportPackageBasicEntity.setBrandId(entity.getBrandId());
-			reportPackageBasicEntity.setBrand(entity.getBrand());
+			reportPackageBasicEntity.setBrand(entity.getBrandName());
 			reportPackageBasicEntity.setWarehouse(warehouse);
 			reportPackageBasicEntity.setWarehouseId(warehouseId);
 			addList.add(reportPackageBasicEntity);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/report/CarsLoadDealListener.java

@@ -275,6 +275,12 @@ public class CarsLoadDealListener {
 				Map<String, PackageData> packageDataMap = packageDataListByPackageType.stream().collect(Collectors.toMap(PackageData::getPackageCode, Function.identity()));
 
 				List<ReportPackageBasicEntity> packageBasicEntityList = reportPackageBasicService.findByOrderPackageCodes(packageCodes);
+				//把packageBasicEntityList转化成以orderPackageCode为key的Map
+				Map<String, ReportPackageBasicEntity> packageBasicEntityMap = packageBasicEntityList.stream().collect(Collectors.toMap(ReportPackageBasicEntity::getOrderPackageCode, Function.identity()));
+//				reportPackageTrunklineService.
+
+
+
 				packageBasicEntityList.forEach(entity -> {
 					ReportPackageTrunklineEntity reportPackageTrunklineEntity = new ReportPackageTrunklineEntity();
 					reportPackageTrunklineEntity.setBasicId(entity.getId());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java

@@ -73,10 +73,12 @@ public class StatusLogListener {
 			WaybillLogDTO t = new WaybillLogDTO();
 			List<PackageData> packageDataList = map.get(waybillNumber);
 			if (packageDataList != null && !packageDataList.isEmpty()) {
-				packageDataList.sort(Comparator.comparing(PackageData::getSignTime));
+				// 按照时间做新的在最前面
+				packageDataList.sort(Comparator.comparing(PackageData::getSignTime).reversed());
 				// 获取排序第一个
 				t.setSignUser(packageDataList.get(0).getSignUser());
 				t.setSignTime(packageDataList.get(0).getSignTime());
+				t.setLoadingUser(packageDataList.get(0).getLoadingUserName());
 			}
 			t.setWaybillNo(waybillNumber);
 			t.setWarehouseName(bean.getWarehouse());
@@ -89,6 +91,7 @@ public class StatusLogListener {
 			t.setNum(waybillCountMap.get(waybillNumber));
 			t.setSignOrderCode(vo.getPickupBatch());
 
+
 			t.setType(3);
 			trunklineWaybillTrackClient.addSignWaybillLog(t);
 

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

@@ -109,5 +109,9 @@ public interface IOpenOrderService {
 	 */
 	R checkWaybillList(CheckWaybillListDTO openOrderDTO);
 
+	void patchCancleCheckWaybill(String waybillNo);
+
+	void patchCheckWaybill(String waybillNo);
+
 //	R findWaybillInfo(String waybillNo);
 }

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

@@ -869,7 +869,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 	}
@@ -938,7 +938,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 	}
@@ -973,7 +973,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 	}
@@ -1011,7 +1011,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 
@@ -1052,7 +1052,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 	}
@@ -1095,7 +1095,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 
@@ -1132,7 +1132,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
-		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
+		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.CARSLOADDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
 
 		sendFanoutService.sendFanoutMsg(fanoutMsg);
 	}

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

@@ -224,7 +224,7 @@ public class InComingServiceImpl implements IInComingService {
 						.build();
 					factoryDataMessageSender.sendNodeDataByBrand(nodePushMsg);
 				} catch (Exception e) {
-					log.error("入库推送失败：{}", e);
+					log.error("入库推送失败：", e);
 				}
 			}
 		}
@@ -822,7 +822,7 @@ public class InComingServiceImpl implements IInComingService {
 		String tenantId = inComingDTO.getTenantId();
 		String nickName = inComingDTO.getNickName();
 
-		List<TrunklineAdvanceDetailEntity> sendAdvanceDetailEntityList = new ArrayList();
+		List<TrunklineAdvanceDetailEntity> sendAdvanceDetailEntityList = new ArrayList<>();
 
 		Set<Long> waybillIdSet = new HashSet<>();
 		Integer total = 0;

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

@@ -197,6 +197,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.success("批量审核成功");
 	}
 
+	@Override
+	public void patchCancleCheckWaybill(String waybillNo) {
+
+		WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+		if(!Objects.isNull(warehouseWaybillEntity)){
+			OpenOrderDTO openOrderDTO = new OpenOrderDTO();
+			openOrderDTO.setWaybillId(warehouseWaybillEntity.getId());
+			openOrderDTO.setCheckRemark("系统皮脸处理");
+			openOrderDTO.setWarehouseId(warehouseWaybillEntity.getDestinationWarehouseId());
+			openOrderDTO.setWarehouseName(warehouseWaybillEntity.getDestinationWarehouseName());
+			cancleCheckWaybill(openOrderDTO);
+		}
+
+	}
+
+	@Override
+	public void patchCheckWaybill(String waybillNo) {
+
+		WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+		if(!Objects.isNull(warehouseWaybillEntity)){
+			OpenOrderDTO openOrderDTO = new OpenOrderDTO();
+			openOrderDTO.setWaybillId(warehouseWaybillEntity.getId());
+			openOrderDTO.setCheckRemark("系统皮脸处理");
+			openOrderDTO.setCheckReson("系统审核");
+			openOrderDTO.setWarehouseId(warehouseWaybillEntity.getDestinationWarehouseId());
+			openOrderDTO.setWarehouseName(warehouseWaybillEntity.getDestinationWarehouseName());
+			checkWaybill(openOrderDTO);
+		}
+
+	}
+
 	@Override
 	public List<TrunklineAdvanceDetailVO> findAdvanceDetailList(Long advanceId) {
 		return advanceDetailService.findList(advanceId);
@@ -1163,7 +1194,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg();
 		nodeFanoutMsg.setNode(WorkNodeEnums.OPEN_ORDER);
-		nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD);
+		nodeFanoutMsg.setBizOperation(BizOperationEnums.MODIFY);
 		nodeFanoutMsg.setOperator(nickName);
 		nodeFanoutMsg.setOperatorId(userId);
 		nodeFanoutMsg.setWarehouse(warehouseName);

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

@@ -569,8 +569,8 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 			packageData.setVolume(detailEntity.getVolume());
 			packageData.setPackageType(PackageTypeEnums.CMP);
 			packageData.setCustomerTrain(detailEntity.getTrainNumber());
-			packageData.setDealerCode(dealerName);
-			packageData.setDealerName(dealerCode);
+			packageData.setDealerCode(dealerCode);
+			packageData.setDealerName(dealerName);
 			String brand = detailEntity.getBrand();
 			packageData.setBrandId(brandMap.get(brand));
 			packageData.setBrandName(brand);

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

@@ -744,6 +744,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		}
 
 		TrunklineAdvanceDetailEntity advanceDetailEntity = advanceDetailEntities.get(0);
+		log.info("############saveOrderAndPackages: advanceDetailEntity={}", advanceDetailEntity);
 		String tenantId = advanceDetailEntity.getTenantId();
 		Long userId = AuthUtil.getUserId();
 		Long deptId = Func.firstLong(AuthUtil.getDeptId());
@@ -781,6 +782,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		FindParamterDTO findParamterDTO = new FindParamterDTO();
 		findParamterDTO.setOrderCodeSet(orderCodeSet);
 		findParamterDTO.setWarehouseId(warehouseId);
+		log.info("############saveOrderAndPackages: findParamterDTO={}", findParamterDTO);
 		List<DistributionStockArticleEntity> stockArticleEntities = stockArticleClient.findListByOrderCodesAndWarehouseId(findParamterDTO);
 		Map<String, DistributionStockArticleEntity> stockArticleMap = new HashMap<>();
 		if (!stockArticleEntities.isEmpty()) {
@@ -790,6 +792,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		FindParamterDTO findParamterD = new FindParamterDTO();
 		findParamterD.setOrderCodeSet(orderCodeSet);
 		findParamterD.setWarehouseId(warehouseId);
+		log.info("############saveOrderAndPackages: findParamterD={}", findParamterD);
+
 		List<DistributionParcelListEntity> parcelListEntities = parcelListClient.findListZhaoBuDaoYuanYin(findParamterD);
 		Map<String, DistributionParcelListEntity> parcelListMap = new HashMap<>();
 		if (!parcelListEntities.isEmpty()) {

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

@@ -194,12 +194,12 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 		}
 		if(type == 3){
 			//如果是配送签收需要补录配送装车记录
-			String operationRemark = warehouseName+" 配送装车"+num+"件，车次号："+trainNumber+"，司机："+driverName+"，车牌号："+carNumber+"，装车人"+ loadingUser+"，配送时间"+ CommonUtil.dateToStringGeneral(deliveryTime);
+			String operationRemark = warehouseName+" 配送装车"+num+"件，车次号："+trainNumber+"，司机："+driverName+"，车牌号："+carNumber+"，装车人："+ loadingUser+"，配送时间："+ CommonUtil.dateToStringGeneral(deliveryTime);
 			openOrderAsyncService.saveLog(waybillId,waybillNo,"90",warehouseName+" 配送装车",operationRemark,nickName,userId,warehouseId,warehouseName);
 		}
 
 		//存入签收日志
-		String operationRemark = warehouseName+" "+typeStr+num+"件，车次号："+trainNumber+"，司机："+driverName+"，车牌号："+carNumber+"，签收人"+ signUser+"，签收单："+signOrderCode+"，签收时间"+ CommonUtil.dateToStringGeneral(signTime);
+		String operationRemark = warehouseName+" "+typeStr+num+"件，车次号："+trainNumber+"，司机："+driverName+"，车牌号："+carNumber+"，签收人："+ signUser+"，签收单："+signOrderCode+"，签收时间："+ CommonUtil.dateToStringGeneral(signTime);
 		openOrderAsyncService.saveLog(waybillId,waybillNo,"100",warehouseName+" "+typeStr,operationRemark,nickName,userId,warehouseId,warehouseName);
 
 		trunklineWaybillPackageService.updateWaybillStatus(waybillEntity);