Merge branch 'dev' into pre-production

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

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

@@ -1022,7 +1022,7 @@
         GROUP_CONCAT( DISTINCT t.signOrderCode ) AS signOrderCode,
         3 AS type,
         #{userId} AS userId,
-        #{userName} AS nickName
+        #{nickName} AS nickName
         FROM
         (
         SELECT

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

@@ -109,6 +109,7 @@ import com.logpm.oldproject.dto.SignPushDataUnitDTO;
 import com.logpm.oldproject.feign.IOldSignPushClient;
 import com.logpm.trunkline.dto.WaybillLogDTO;
 import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
+import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.log4j.Log4j2;
@@ -255,6 +256,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Autowired
 	private IDistributionNodeWorkService iDistributionNodeWorkService;
 
+	@Autowired
+	private ITrunklineWaybillTrackClient trunklineWaybillTrackClient;
+
 
 	@Override
 	public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) {
@@ -3698,8 +3702,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				// 回传老系统自提数据
 				sendOldSystem(Long.parseLong(s));
 				//整理运单信息
-//				List<WaybillLogDTO> mapList = baseMapper.getWaybillSignforData(billLadingEntity.getId(),AuthUtil.getUser().getUserId(),AuthUtil.getUser().getNickName());
-
+				handletrunklineWaybillSignLog(billLadingEntity.getId());
 			}
 		// 回传工厂数据
 		sendFactory(myCurrentWarehouse, parcelListIds);
@@ -3731,6 +3734,15 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		}
 	}
 
+	private void handletrunklineWaybillSignLog(Long id) {
+		List<WaybillLogDTO> mapList = baseMapper.getWaybillSignforData(id, AuthUtil.getUser().getUserId(), AuthUtil.getUser().getNickName());
+		if (!mapList.isEmpty()) {
+			for (WaybillLogDTO waybillLogDTO : mapList) {
+				trunklineWaybillTrackClient.addSignWaybillLog(waybillLogDTO);
+			}
+		}
+	}
+
 	public void releaseBillLadingResource(Long l, BasicdataWarehouseEntity warehouse,String pickupBatch) {
 		List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 			.eq(DistrilbutionBillPackageEntity::getBillLadingId, l)
@@ -3757,7 +3769,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				List<JSONObject> logList = new ArrayList<>();
 
 				for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
-					String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "取消自提,操作方式:复核自提单包件释放,自提批次号:" + pickupBatch;
+					String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "确认自提,取消包件计划,操作方式:复核自提单包件释放,自提批次号:" + pickupBatch;
 					JSONObject logJS = handleLogJSONObject(warehouse, AuthUtil.getUser(), distributionParcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_BILLOFLADING.getCode());
 					logList.add(logJS);
 				}