Merge branch 'pre-production'

blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -45,7 +45,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos dev 地址
 	 */
-	String NACOS_DEV_ADDR = "192.168.3.100:8848";
+	String NACOS_DEV_ADDR = "192.168.2.46:8848";
 
 
 	/**
@@ -77,7 +77,7 @@ public interface LauncherConstant {
 	/**
 	 * seata dev 地址
 	 */
-	String SEATA_DEV_ADDR = "192.168.3.100:8091";
+	String SEATA_DEV_ADDR = "192.168.2.46:8091";
 
 
 	/**

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -41,7 +41,7 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 
 		// 开启elk日志
-//		PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
+		PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
 
 
 

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

@@ -19,5 +19,6 @@ public class OrderCodeDataVO {
 
 	@ApiModelProperty(value = "模板填充内容")
 	private List<Map<String,Object>> dataList;
+	private List<String> moldList;
 
 }

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

@@ -20,4 +20,6 @@ public class OrderPackgeCodeDataVO  {
 	@ApiModelProperty(value = "模板填充内容")
 	private List<Map> dataList;
 
+	private List<String> moldList;
+
 }

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

@@ -5,4 +5,10 @@ import lombok.Data;
 
 @Data
 public class TrunklineCarsOrderVO extends TrunklineCarsOrderEntity {
+
+	private String mallName;
+	private String mallPerson;
+	private String mallMobile;
+	private String mallAddress;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -314,7 +314,7 @@ public class DistributionSignforController extends BladeController {
 				List<Long> packageIds = (List<Long>) data.get("packageIds");
 				Long signId = (Long) data.get("signId");
 				distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId());
-				distributionAsyncService.sendReviewFactory(signId,myCurrentWarehouse.getName() ,myCurrentWarehouse.getId());
+//				distributionAsyncService.sendReviewFactory(signId,myCurrentWarehouse.getName() ,myCurrentWarehouse.getId()); PC对于的批量签收同样需要复核
 			}
 			String orderPackageCodes = null;
 			for (String packageCode : packageCodes) {

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

@@ -57,7 +57,7 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @param distributionStockupEntity
 	 * @return
 	 */
-	IPage<DistributionStockupEntity> pageList(IPage<Object> page,@Param("param") DistributionStockupEntity distributionStockupEntity);
+	IPage<DistributionStockupEntity> pageList(IPage<Object> page,@Param("param") DistributionStockupEntity distributionStockupEntity,@Param("warehouseIdList") List<Long> warehouseIdList);
 
     IPage<DistributionStockupListVO> selectStockupPage(IPage<Object> page, @Param("param") StockupDTO stockupDTO);
 
@@ -168,7 +168,7 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @param distributionStockupEntity
 	 * @return
 	 */
-	IPage<DistributionStockupEntity> pageOweList(IPage<Object> page,@Param("param")DistributionStockupEntity distributionStockupEntity);
+	IPage<DistributionStockupEntity> pageOweList(IPage<Object> page,@Param("param")DistributionStockupEntity distributionStockupEntity ,@Param("warehouseIdList") List<Long> warehouseIdList);
 
 	IPage<DistributionStockupVO> getInventoryOwnSelf(IPage<Object> page,@Param("id") Long id);
 

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

@@ -248,41 +248,18 @@
         lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
-        COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation,
-        COALESCE(GROUP_CONCAT(DISTINCT lwt.pallet_name SEPARATOR ','), '') pallet,
+        COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '') stockipAllocation,
+        COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet,
         COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
         LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id
-        LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
-        LEFT JOIN (
-        SELECT
-        IFNULL(COUNT( b.reservation_id ),0 )AS aaa,
-        b.stockup_id AS stockup_id
-        FROM
-        logpm_distribution_stockup AS a
-        LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id
-        <where>
-            b.stock_status != 4
-            <if test="param.warehouseId != null and param.warehouseId != '' ">and a.warehouse_id =
-                #{param.warehouseId}
-            </if>
-            <if test="param.warehouseIdList != null">
-                and a.warehouse_id in
-                <foreach collection="param.warehouseIdList" item="a" open="(" separator="," close=")">
-                    #{a}
-                </foreach>
-            </if>
-        </where>
-        GROUP BY b.stockup_id
-        ) AS aa ON aa.stockup_id = lds.id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
+
         <where>
             lds.is_deleted = 0  AND ldsi.stock_status != 4
-            <!--            AND aa.aaa > 0-->
-            <!-- lds.tenant_id = #{param.tenantId} -->
+
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =  #{param.typeService}
             </if>
             <if test="param.consignee != null and param.consignee != '' "> and
@@ -295,9 +272,13 @@
             <if test="param.stockupUser != null and param.stockupUser != '' ">and lds.stockup_user like
                 concat('%',#{param.stockupUser},'%')
             </if>
-            <if test="param.stockipAllocation != null and param.stockipAllocation != '' ">and lds.stockip_allocation
+            <if test="param.stockipAllocation != null and param.stockipAllocation != '' ">and ldpl.goods_allocation
                 like concat('%',#{param.stockipAllocation},'%')
             </if>
+            <if test="param.pallet != null and param.pallet != '' ">and ldpl.pallet
+                like concat('%',#{param.pallet},'%')
+            </if>
+
             <if test="param.stockupCode != null and param.stockupCode != '' ">and lds.stockup_code like
                 concat('%',#{param.stockupCode},'%')
             </if>
@@ -316,14 +297,14 @@
             <if test="param.loaderName != null and param.loaderName != '' ">and lds.loader_name like concat('%',
                 #{param.loaderName},'%')
             </if>
-            <!--             <if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if>-->
-            <!--<if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>-->
-            <if test="param.warehouseId != null and param.warehouseId != '' ">and lds.warehouse_id =
-                #{param.warehouseId}
-            </if>
-            <if test="param.warehouseIdList != null">
+
+            <if test="warehouseIdList != null">
                 and lds.warehouse_id in
-                <foreach collection="param.warehouseIdList" item="a" open="(" separator="," close=")">
+                <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
+                    #{a}
+                </foreach>
+                and ldpl.warehouse_id in
+                <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
                     #{a}
                 </foreach>
             </if>
@@ -368,16 +349,15 @@
         lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
-        COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')stockipAllocation,
-        COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet,
+        COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '')stockipAllocation,
+        COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet,
         COALESCE(group_concat(DISTINCT ldsa.mall_name separator ','), '') as consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldbs.order_status in (1,2)
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+
         LEFT JOIN (
         SELECT
         IFNULL(COUNT( b.reservation_id ),0 )AS aaa,
@@ -404,9 +384,13 @@
             <if test="param.stockupUser != null and param.stockupUser != '' ">and lds.stockup_user like
                 concat('%',#{param.stockupUser},'%')
             </if>
-            <if test="param.stockipAllocation != null and param.stockipAllocation != '' ">and lds.stockip_allocation
+            <if test="param.stockipAllocation != null and param.stockipAllocation != '' ">and ldpl.goods_allocation
                 like concat('%',#{param.stockipAllocation},'%')
             </if>
+            <if test="param.pallet != null and param.pallet != '' ">and ldpl.pallet
+                like concat('%',#{param.pallet},'%')
+            </if>
+
             <if test="param.stockupCode != null and param.stockupCode != '' ">and lds.stockup_code like
                 concat('%',#{param.stockupCode},'%')
             </if>
@@ -425,19 +409,13 @@
             <if test="param.loaderName != null and param.loaderName != '' ">and lds.loader_name like concat('%',
                 #{param.loaderName},'%')
             </if>
-            <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =
-                #{param.typeService}
-            </if>
-            <if test="param.warehouseId != null and param.warehouseId != '' ">and lds.warehouse_id =
-                #{param.warehouseId}
-            </if>
-            <if test="param.warehouseIdList != null">
+
+            <if test="warehouseIdList != null">
                 and lds.warehouse_id in
-                <foreach collection="param.warehouseIdList" item="a" open="(" separator="," close=")">
+                <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
                     #{a}
                 </foreach>
             </if>
-            <!--<if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if> -->
         </where>
         GROUP BY lds.id
         ORDER By lds.create_time Desc

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

@@ -1535,30 +1535,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				}
 
 				if (Func.isNotEmpty(brand.get("欧派"))) {
-
-					// 重新筛选出欧派的包件
-					for (DistributionReservationStockarticleEntity distributionReservationStockarticleEntity : distributionReservationStockarticleEntities) {
-
-						// 查询预约单下面的包件信息
-						log.info(">>>>>>>>>>>>>>>>>>>>> 欧派循环包件信息 {} ", distributionReservationStockarticleEntity);
-						List<DistributionParcelListEntity> distributionParcelListEntities = buildOpByReservationId(distributionReservationStockarticleEntity);
-
-
-						for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
-							// todo 查询签收信息
-							DistributionSignforEntity distributionSignfor = distributionSignforMapper.getByReservationId(distributionReservationStockarticleEntity.getReservationId());
+					List<MtReceiveContentDTO> oupai = brand.get("欧派");
+					for (MtReceiveContentDTO mtReceiveContentDTO : oupai) {
 						OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
-							orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode());  //单号
-							orderStatusDTO.setUsername(distributionSignfor.getSigneeName());  //操作人名称
+						orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo());  //包条
+						orderStatusDTO.setUsername(distributionSignforEntity.getSigneeName());  //操作人名称
 						orderStatusDTO.setStatus("7");
-							orderStatusDTO.setOperationTime(distributionSignfor.getSigningTime());   //时间
+						orderStatusDTO.setOperationTime(distributionSignforEntity.getSigningTime());   //时间
 						ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO);
-							log.info(">>>>>>>>>>>>>>>>>进入newSystemHandleStatusData   orderStatusDTO值 ：{}", orderStatusDTO);
 					}
 				}
-
-//					orderMainClinet.sendReceiveInfoByNewSystem(mtReceiveDTO);
-				}
 				if (Func.isNotEmpty(brand.get("志邦"))) {
 					List<MtReceiveContentDTO> zb = brand.get("志邦");
 					List<Object> contents = new ArrayList<>();
@@ -1599,7 +1585,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
 								rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
 							} catch (Exception e) {
-								log.error("入库推送失败：{}", e);
+								log.error("入库推送失败", e);
 							}
 						}
 					}
@@ -1629,8 +1615,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 				//....工厂
 			} catch (Exception e) {
-				log.error("sendReviewFactory ", e);
-				throw new RuntimeException(e);
+				log.error("复核推送工厂信息错误 ", e);
+//				throw new RuntimeException(e);
 			}
 		}
 
@@ -3021,7 +3007,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					}
 					orderList.add(order);
 
-					if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){
+					if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
 						//构建包件信息
 						List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), distributionStockArticleEntity.getId(), distributionStockArticleEntity.getWarehouseId());
 						if (!distributionParcelListEntities.isEmpty()) {
@@ -3040,7 +3026,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								}
 							}
 						}
-					}else {
+					} else {
 						//整理零担的数据
 						List<DistributionParcelNumberVO> distributionParcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(distributionStockArticleEntity.getId(), reservationEntity.getId());
 						if (!distributionParcelNumberVOS.isEmpty()) {
@@ -3115,7 +3101,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		}
 		pushInstallDTO.setOrder(orderList);
 		pushInstallDTO.setOrder_detail(orderDetailList);
-		log.info(">>>>>>>>>>>>>>安装推送整理数据:{}",JSONObject.toJSON(pushInstallDTO));
+		log.info(">>>>>>>>>>>>>>安装推送整理数据:{}", JSONObject.toJSON(pushInstallDTO));
 		String jsonString = JSONObject.toJSONString(pushInstallDTO);
 		rabbitTemplate.convertAndSend(RabbitConstant.PUSH_INSTALL_PLATFORM_EXCHANGE, RabbitConstant.PUSH_INSTALL_PLATFORM_ROUTING, jsonString);
 

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

@@ -694,6 +694,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//开启异步查询此配送客户需要推送至安装平台数据
 			distributionAsyncService.sendInstallToPlatform(reservationEntity);
 		}
+
+//		// 复核作业节点推送
+//		iDistributionNodeWorkService.signForCheck(DistributionSignforEntity distributionSignforEntity,DistributionReservationEntity reservationEntity);
+
+//		sendNodeWorkDataBroadcast();
+
+
 		return R.success("操作成功");
 	}
 
@@ -2603,6 +2610,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 					loadscanEntity.setSigningUser(nickName);
 					loadscanEntity.setSigningUserId(userId);
+					loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 
 
 					distributionLoadscanService.updateById(loadscanEntity);
@@ -2673,6 +2681,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscanEntity.setOneClick(1);
 					distributionLoadscanEntity.setOneQclick(1);
 					distributionLoadscanEntity.setIsInsert(2);
+					distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 					distributionLoadscanEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
 					distributionLoadscanEntity.setPackageNub(collect.get(0).getQuantity());
 					distributionLoadscanEntity.setOrderId(collect.get(0).getStockArticleId());
@@ -3387,7 +3396,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						jsonObjects.add(jsonObject);
 						warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
 //				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
-						if (Func.isEmpty(loadscanEntity)) {
+						if (Func.isEmpty(loadscanEntity.getId())) {
 							//更新装车包件数和签收包件数
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							loadingId = distributionLoadscanEntity.getId();
@@ -3400,7 +3409,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getTrainNumber(), parcelListEntity.getWarehouseEntryTimeEnd());
 						aaa.add(trunklinePackageTrackLog);
-						assert loadscanEntity != null;
 
                     } else {
 						return Resp.scanFail("操作失败", "不属于该客户");

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

@@ -46,8 +46,6 @@ import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleNewWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
-import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
-import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
@@ -792,6 +790,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		orderPackgeCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("包件码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderPackgeCodeDataVO.setMoldList(moldList);
+
 		return orderPackgeCodeDataVO;
 	}
 
@@ -2471,6 +2480,18 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		orderCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("订单码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderCodeDataVO.setMoldList(moldList);
+
+
 		return orderCodeDataVO;
 	}
 
@@ -2536,6 +2557,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		orderCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("订单码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderCodeDataVO.setMoldList(moldList);
+
 		return orderCodeDataVO;
 	}
 

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

@@ -291,24 +291,25 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	public IPage<DistributionStockupEntity> pageList(IPage<Object> page, Map<String, Object> distributionStockup) {
 		DistributionStockupEntity distributionStockupEntity = JSON.parseObject(JSON.toJSONString(distributionStockup), DistributionStockupEntity.class);
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+
+		List<Long> warehouseIdList = new ArrayList<>();
 		if (ObjectUtils.isNotNull(myCurrentWarehouse)) {
 			//获取当前登录人仓库
-			distributionStockupEntity.setWarehouseId(myCurrentWarehouse.getId());
+			warehouseIdList.add(myCurrentWarehouse.getId());
 		} else {
 			//获取当前登录人仓库
 			List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
 			//取出id
 			List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
-			distributionStockupEntity.setWarehouseIdList(collect);
+			warehouseIdList.addAll(collect);
 		}
 
-		distributionStockupEntity.setTenantId(AuthUtil.getTenantId());
 		if ("3".equals(distributionStockupEntity.getTypeService())) {
 			//自
-			return baseMapper.pageOweList(page, distributionStockupEntity);
+			return baseMapper.pageOweList(page, distributionStockupEntity,warehouseIdList);
 		} else {
 			//商  市
-			return baseMapper.pageList(page, distributionStockupEntity);
+			return baseMapper.pageList(page, distributionStockupEntity,warehouseIdList);
 		}
 	}
 

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

@@ -3093,11 +3093,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "自提扫描签收,操作方式:扫描签收,自提批次号:" + pickupBatch;
 		JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), coding, content, WorkNodeEnums.SIGN_BILLOFLADING.getCode());
 		aaa.add(js);
-		if (!aaa.isEmpty()) {
         trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
 
-		}
-
         distributionBillLadingScanService.save(distributionBillLadingScan);
 		distributionStockListMapper.deductionQuantityStock(matchedPackage.getStockListId(), matchedPackage.getNum());
 

blade-service/logpm-distribution/src/main/resources/application-dev.yml

@@ -15,10 +15,10 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.3.100
+    host: 192.168.2.46
     port: 5672
     username: admin
-    password: 123456
+    password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/entity/PackageInfoEntity.java

@@ -25,6 +25,8 @@ public class PackageInfoEntity extends BaseEntity {
 	private String deliveryNoteId;
 	@ApiModelProperty(value = "订单号")
 	private String orderCode;
+	@ApiModelProperty(value = "单据编号")
+	private String billCode;
 	@ApiModelProperty(value = "已推送节点编码")
 	private Integer workedNodeCode;
 	@ApiModelProperty(value = "父项物料编码")

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/mq/FactoryOrderListener.java

@@ -106,7 +106,8 @@ public class FactoryOrderListener {
 				BeanUtil.copyProperties(orderInfo, orderInfoEntity);
 				orderInfoEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);
 				orderInfoEntity.setDeliveryNoteId(vo.getId().toString());
-				orderInfoEntity.setOrderCode(vo.getBillCode());
+				orderInfoEntity.setOrderCode(vo.getCustomizedBillCode());
+				orderInfoEntity.setBillCode(vo.getBillCode());
 				infoEntities.add(orderInfoEntity);
 			}
 			packageInfoService.saveBatch(infoEntities);

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/mq/NodeDataPushListener.java

@@ -22,7 +22,6 @@ import com.logpm.factorydata.vo.PushData;
 import com.logpm.factorydata.vo.SendMsg;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.util.Pack;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.factorydata.FactoryDataConstants;
 import org.springframework.amqp.core.ExchangeTypes;
@@ -142,6 +141,8 @@ public class NodeDataPushListener {
 					List<String> collect = value.stream().map(PushData::getPackageCode).collect(Collectors.toList());
 					// 5 根据订单号，包件码 查看数据是否齐套，齐套直接推送工厂
 					List<PackageInfoEntity> entities = packageInfoMap.get(orderCode);
+					PackageInfoEntity infoEntity = entities.get(0);
+					String billCode = infoEntity.getBillCode();
 					// 过滤掉entities 中的 workedNodeCode < code 的数据
 					List<PackageInfoEntity> workerList = entities.stream()
 						.filter(packageInfoEntity -> !collect.contains(packageInfoEntity.getBarcode()))
@@ -174,7 +175,7 @@ public class NodeDataPushListener {
 						}
 						// 推送工厂
 						JSONObject sendObj = new JSONObject();
-						sendObj.set("billCode", orderCode);
+						sendObj.set("billCode", billCode);
 						sendObj.set("status", factoryByNodeAndStatus.getText());
 						sendObj.set("packages", entities.stream().map(packageInfoEntity -> {
 							JSONObject jsonObject = new JSONObject();

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java

@@ -104,7 +104,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advanceEntity.setSenderAddress("");
 		advanceEntity.setTrainNumber(StrUtil.replace(DateUtil.today(), "-", ""));
 		advanceEntity.setSenderFactory(BrandEnums.LINSY.getValue());
-		advanceEntity.setOrderCode(vo.getBillCode());
+		// advanceEntity.setOrderCode(vo.getBillCode());
+		advanceEntity.setOrderCode(vo.getCustomizedBillCode());
 		advanceEntity.setDealerCode("");
 		advanceEntity.setDealerName(vo.getShopName());
 		advanceEntity.setStoreCode("");
@@ -124,7 +125,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.setWarehouseName(startWarehouseName);
 //					advanceDetailEntity.setIncomingWarehouseId(0L);
 //					advanceDetailEntity.setIncomingWarehouseName("");
-			advanceDetailEntity.setOrderCode(vo.getBillCode());
+			advanceDetailEntity.setOrderCode(vo.getCustomizedBillCode());
 			advanceDetailEntity.setBrand(BrandEnums.LINSY.getValue());
 			advanceDetailEntity.setSystemType("线上");
 			advanceDetailEntity.setFirstPackName(orderPackageDTO.getMaterialCode());
@@ -220,7 +221,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advance.set("mtdsNo", "");
 		advance.set("warehouse_id", startWarehouseId);
 		advance.set("mctsTruck", StrUtil.replace(DateUtil.today(), "-", ""));
-		advance.set("orderSelfNum", vo.getBillCode());
+		// advance.set("orderSelfNum", vo.getBillCode());
+		advance.set("orderSelfNum", vo.getCustomizedBillCode());
 		advance.set("dealerName", vo.getShopName());
 		advance.set("dealerCode", "");
 		advance.set("storeName", vo.getShopName());
@@ -258,7 +260,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			// advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
 			// 封装包件
 			JSONObject advanceDetailEntity = new JSONObject();
-			advanceDetailEntity.set("orderSelfNum", vo.getBillCode());
+			// advanceDetailEntity.set("orderSelfNum", vo.getBillCode());
+			advanceDetailEntity.set("orderSelfNum", vo.getCustomizedBillCode());
 			advanceDetailEntity.set("serviceNum", vo.getCustomizedBillCode());
 			advanceDetailEntity.set("type", BrandEnums.LINSY.getValue());
 			advanceDetailEntity.set("systemType", "线上");

blade-service/logpm-factory/src/main/resources/application-dev.yml

@@ -12,10 +12,10 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.3.100
+    host: 192.168.2.46
     port: 5672
     username: admin
-    password: 123456
+    password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml

@@ -12,10 +12,10 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.3.100
+    host: 192.168.2.46
     port: 5672
     username: admin
-    password: 123456
+    password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -154,6 +154,40 @@ public class CarsLoadController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/editNodeInfo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询编辑配载计划详情", notes = "传入loadCarsDTO")
+	public R editNodeInfo(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############editNodeInfo: ";
+		log.info(method+"请求参数{}",loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+
+		try{
+
+			//当前登录人选择的仓库
+//			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//			if(Objects.isNull(myCurrentWarehouse)){
+//				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+//				return R.fail(400,"多仓权限无法操作，请选择仓库");
+//			}
+
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(400,"配载id为空");
+			}
+
+			return carsLoadService.selectEditDetailByLoadIdNoXz(loadId);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
 	@ResponseBody
 	@PostMapping("/updateCarsLoadBasicData")
 	@ApiOperationSupport(order = 1)
@@ -1219,12 +1253,12 @@ public class CarsLoadController {
 		try{
 
 			//当前登录人选择的仓库
-			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			if(Objects.isNull(myCurrentWarehouse)){
-				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
-				return R.fail(400,"多仓权限无法操作，请选择仓库");
-			}
-			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+//			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//			if(Objects.isNull(myCurrentWarehouse)){
+//				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+//				return R.fail(400,"多仓权限无法操作，请选择仓库");
+//			}
+//			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
 
 			if(Objects.isNull(loadId)){
 				log.warn(method+"配载计划id为空 loadId={}",loadId);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -464,10 +464,10 @@
           and ltcl.load_status != '0'
           and ltcl.load_type != '4'
         <if test="param.startTime != null">
-            and ltcl.start_time &gt;= #{param.startDate}
+            and ltcl.start_time &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null">
-            and ltcl.start_time &lt;= #{param.endDate}
+            and ltcl.start_time &lt;= #{param.endTime}
         </if>
     </select>
 
@@ -578,6 +578,7 @@
         from logpm_trunkline_cars_load_scan t
                  left join logpm_distribution_parcel_list dpl on dpl.order_package_code = t.scan_code and dpl.warehouse_id = #{warehouseId}
         where t.load_id = #{loadId}
+        and dpl.id is not null
         group by dpl.brand_name,dpl.accept_warehouse_id,dpl.order_code,dpl.waybill_number
     </select>
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -162,4 +162,7 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 
 	void deleteListByCarsLoadScanIds(@Param("carsLoadScanIdList") List<Long> carsLoadScanIdList);
 
+	void clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo);
+
+	void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(@Param("loadId") Long finalLoadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo, @Param("signOrderId") Long signOrderId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -360,6 +360,7 @@
         select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where sign_order_id = #{signOrderId}
+        and scan_status = '3'
     </select>
 
     <update id="updateFinalNodeIdAndFinalNodeNameById">
@@ -853,4 +854,24 @@
         </foreach>
     </delete>
 
+    <update id="clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo">
+        update logpm_trunkline_cars_load_scan
+        set sign_order_id = null
+        where load_id = #{loadId}
+        and warehouse_id = #{nodeId}
+        and order_code = #{orderCode}
+        and waybill_no = #{waybillNo}
+        and scan_status = '1'
+    </update>
+
+    <update id="addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo">
+        update logpm_trunkline_cars_load_scan
+        set sign_order_id = #{signOrderId}
+        where load_id = #{loadId}
+        and warehouse_id = #{nodeId}
+        and order_code = #{orderCode}
+        and waybill_no = #{waybillNo}
+        and scan_status = '1'
+    </update>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java

@@ -60,4 +60,8 @@ public interface TrunklineCarsOrderMapper extends BaseMapper<TrunklineCarsOrderE
     List<TrunklineCarsOrderEntity> findLoadingList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
 
     Integer findLoadingNumBySignOrderId(@Param("signOrderId") Long signOrderId);
+
+	void updateNoCustomer(@Param("updateCarsOrderIdList") List<Long> updateCarsOrderIdList);
+
+	List<TrunklineCarsOrderVO> findMallOrderList(@Param("carsOrderIdList") List<Long> carsOrderIdList);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml

@@ -225,11 +225,13 @@
                lww.id belongToWarehouseId,
                lww.name belongToWarehouseName,
                ltco.final_node_id finalNodeId,
-               0 signNum,
-               '0' signStatus,
+               case when sum(ltco.sign_num) >= sum(ltco.real_num) and sum(ltco.sign_num) > 0 then '20'
+                   when sum(ltco.sign_num) = 0 then '0'
+                   else '10' end signStatus,
                GROUP_CONCAT(distinct ldsa.consignee_person) mallPerson,
                GROUP_CONCAT(distinct ldsa.consignee_mobile) mallMobile,
                GROUP_CONCAT(distinct ldsa.consignee_address) mallAddress,
+               sum(ltco.sign_num) signNum,
                sum(ltco.plan_num) planNum,
                sum(ltco.real_num) loadingNum
         from logpm_trunkline_cars_order ltco
@@ -322,5 +324,30 @@
         where sign_order_id = #{signOrderId}
     </select>
 
+    <update id="updateNoCustomer" >
+        update logpm_trunkline_cars_order
+        set is_customer = '0',
+            sign_order_id = null
+        where id in
+        <foreach collection="updateCarsOrderIdList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and sign_num = 0
+    </update>
+
+    <select id="findMallOrderList" resultType="com.logpm.trunkline.vo.TrunklineCarsOrderVO">
+        select ltco.*,
+               ldsa.mall_name mallName,
+               ldsa.consignee_person mallPerson,
+               ldsa.consignee_mobile mallMobile,
+               ldsa.consignee_address mallAddress
+        from logpm_trunkline_cars_order ltco
+        left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code and ldsa.warehouse_id = ltco.node_id
+        where ltco.id in
+        <foreach collection="carsOrderIdList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.java

@@ -26,4 +26,7 @@ public interface TrunklineLoadSignOrderMapper extends BaseMapper<TrunklineLoadSi
 	void updateBelongToWarehouse(@Param("signOrderId") Long signOrderId, @Param("warehouseId") Long warehouseId, @Param("warehouseName") String warehouseName);
 
 	IPage<TrunklineLoadSignOrderVO> findSignOrderPageList(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
+
+	void deleteListBySignOrderIds(@Param("delSignOrderList") List<Long> delSignOrderList);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml

@@ -135,7 +135,7 @@
             <if test="param.loadId != null">
                 and ltlso.load_id = #{param.loadId}
             </if>
-            <if test="param.loadCarsNo != null param.loadCarsNo != ''">
+            <if test="param.loadCarsNo != null and param.loadCarsNo != ''">
                 and ltcl.cars_no = #{param.loadCarsNo}
             </if>
             <if test="param.signStatus != null and param.signStatus == '20'">
@@ -152,4 +152,13 @@
         GROUP BY ltlso.id
     </select>
 
+
+    <delete id="deleteListBySignOrderIds" >
+        delete from logpm_trunkline_load_sign_order
+        where id in
+        <foreach collection="delSignOrderList" item="signOrderId" open="(" separator="," close=")">
+            #{signOrderId}
+        </foreach>
+    </delete>
+
 </mapper>

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

@@ -19,7 +19,7 @@ public interface ICarsLoadAsyncService {
 
 	void abnormalListUnloadByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, Long loadScanId, String tenantId, Long userId, String nickName, Long firstLong);
 
-	void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String nodeName, String tenantId, Long userId, String nickName, Long firstLong);
+	void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String nodeName, String tenantId, Long userId, String nickName, Long firstLong,TrunklineCarsLoadLineEntity carsLoadLineEntity);
 
 	void dealwithAfterAbnormalPackage(String orderPackageCode, Long warehouseId, String warehouseName, String carsNo, Long userId, Long aLong, String nickName);
 

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

@@ -157,4 +157,7 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 
 	void deleteListByCarsLoadScanIds(List<Long> carsLoadScanIdList);
 
+	void clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(Long finalLoadId1, Long nodeId, String orderCode, String waybillNo);
+
+	void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long finalLoadId, Long nodeId, String orderCode, String waybillNo, Long signOrderId);
 }

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

@@ -219,4 +219,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R findSignPhotoList(LoadCarsDTO loadCarsDTO);
 
 	R adnormalHasStock(Long carsLoadScanId, Long warehouseId);
+
+	R selectEditDetailByLoadIdNoXz(Long loadId);
 }

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

@@ -57,4 +57,8 @@ public interface ITrunklineCarsOrderService extends BaseService<TrunklineCarsOrd
     List<TrunklineCarsOrderEntity> findLoadingList(Long loadId, Long nodeId);
 
     Integer findLoadingNumBySignOrderId(Long signOrderId);
+
+	void updateNoCustomer(List<Long> updateCarsOrderIdList);
+
+	List<TrunklineCarsOrderVO> findMallOrderList(List<Long> carsOrderIdList);
 }

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

@@ -23,4 +23,8 @@ public interface ITrunklineLoadSignOrderService extends BaseService<TrunklineLoa
 	void updateBelongToWarehouse(Long signOrderId, Long warehouseId, String warehouseName);
 
 	IPage<TrunklineLoadSignOrderVO> findSignOrderPageList(IPage<Object> page, LoadCarsDTO loadCarsDTO);
+
+	void deleteListBySignOrderIds(List<Long> delSignOrderList);
+
+	List<TrunklineLoadSignOrderEntity> findSignOrderListByLoadId(Long loadId);
 }

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

@@ -418,12 +418,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId) {
+	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId,TrunklineCarsLoadLineEntity carsLoadLineEntity) {
 
 		log.info("################abnormalListUnloadCheckByLoadIdAndWarehouseId: 卸车报告生成开始 loadId={}",loadId);
 
 		UnloadReportVO unloadReportVO = trunklineCarsLoadScanService.findUnloadReport(loadId,warehouseId);
-		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if(!Objects.isNull(carsLoadLineEntity)){
 			carsLoadLineEntity.setUnloadReportStatus(1);
 			carsLoadLineEntity.setReportOne("本次装车件数 "+unloadReportVO.getLoadingNum()+" 件，实际卸车件数 "+unloadReportVO.getUnloadNum()+" 件，计划未卸车数量 "+(unloadReportVO.getNoUnloadNum()-unloadReportVO.getNoPlanNum())+" 件");

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

@@ -61,12 +61,13 @@ public class PackageTrackLogAsyncServiceImpl implements IPackageTrackLogAsyncSer
 	@LogpmAsync("asyncExecutor")
 	@Override
 	public void addBatchPackageTrackLog(List<WarehousePackageTrackLogEntity> addPackageTrackLogList, List<String> orderPackageCodes, Integer workNode, Map<String, JSONObject> map) {
+		if(CollUtil.isNotEmpty(addPackageTrackLogList)){
 			warehousePackageTrackLogClient.addLogList(addPackageTrackLogList);
 			WarehousePackageTrackLogEntity warehousePackageTrackLogEntity = addPackageTrackLogList.get(0);
 			Long warehouseId = warehousePackageTrackLogEntity.getWarehouseId();
-
 			waybillPackageService.updatePackageStatus(orderPackageCodes, workNode,warehouseId, map);
 		}
+	}
 
 	@LogpmAsync("asyncExecutor")
 	@Override

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

@@ -378,4 +378,14 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		 baseMapper.deleteListByCarsLoadScanIds(carsLoadScanIdList);
 	}
 
+	@Override
+	public void clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(Long finalLoadId1, Long nodeId, String orderCode, String waybillNo) {
+		baseMapper.clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(finalLoadId1,nodeId,orderCode,waybillNo);
+	}
+
+	@Override
+	public void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long finalLoadId, Long nodeId, String orderCode, String waybillNo, Long signOrderId) {
+		baseMapper.addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(finalLoadId,nodeId,orderCode,waybillNo,signOrderId);
+	}
+
 }

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

@@ -138,4 +138,14 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl<Trunkli
 		return baseMapper.findLoadingNumBySignOrderId(signOrderId);
 	}
 
+	@Override
+	public void updateNoCustomer(List<Long> updateCarsOrderIdList) {
+		baseMapper.updateNoCustomer(updateCarsOrderIdList);
+	}
+
+	@Override
+	public List<TrunklineCarsOrderVO> findMallOrderList(List<Long> carsOrderIdList) {
+		return baseMapper.findMallOrderList(carsOrderIdList);
+	}
+
 }

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

@@ -1,9 +1,9 @@
 package com.logpm.trunkline.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
 import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity;
-import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity;
 import com.logpm.trunkline.mapper.TrunklineLoadSignOrderMapper;
 import com.logpm.trunkline.service.ITrunklineLoadSignOrderService;
 import com.logpm.trunkline.vo.SignOrderDetailVO;
@@ -54,4 +54,16 @@ public class TrunklineLoadSignOrderServiceImpl extends BaseServiceImpl<Trunkline
 	public IPage<TrunklineLoadSignOrderVO> findSignOrderPageList(IPage<Object> page, LoadCarsDTO loadCarsDTO) {
 		return baseMapper.findSignOrderPageList(page,loadCarsDTO);
 	}
+
+	@Override
+	public void deleteListBySignOrderIds(List<Long> delSignOrderList) {
+		baseMapper.deleteListBySignOrderIds(delSignOrderList);
+	}
+
+	@Override
+	public List<TrunklineLoadSignOrderEntity> findSignOrderListByLoadId(Long loadId) {
+		QueryWrapper<TrunklineLoadSignOrderEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("load_id",loadId);
+		return baseMapper.selectList(queryWrapper);
+	}
 }

blade-service/logpm-trunkline/src/main/resources/application-dev.yml

@@ -12,10 +12,10 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.3.100
+    host: 192.168.2.46
     port: 5672
     username: admin
-    password: 123456
+    password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

blade-service/logpm-warehouse/src/main/resources/application-dev.yml

@@ -12,10 +12,10 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.3.100
+    host: 192.168.2.46
     port: 5672
     username: admin
-    password: 123456
+    password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)