Merge branch 'dev' into 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-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/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("操作成功");
 	}
 

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/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/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

@@ -853,4 +853,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

@@ -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/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/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/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/TrunklineCarsLoadServiceImpl.java

@@ -4389,7 +4389,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long loadId = loadCarsDTO.getLoadId();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
 
-
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		String warehouseName = warehouseEntity.getName();
+		String warehouseCode = warehouseEntity.getWarehouseCode();
 
 		String[] split = carsOrderIds.split(",");
 		List<Long> carsOrderIdList = new ArrayList<>();
@@ -4404,18 +4406,196 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		if(Objects.isNull(carsLoadEntity)){
 			log.warn("###########updateWaybillOrderIsCustemer: 配载计划不存在 loadId={}",loadId);
 			return R.fail(405,"配载计划不存在");
+		}
+
+
+		if("1".equals(isCustomer)){
+			//直发商家添加
+			List<TrunklineCarsOrderVO> addCarsOrderEntityList = trunklineCarsOrderService.findMallOrderList(carsOrderIdList);
+			//把addCarsOrderEntityList中所有元素以mallName和nodeId作为key进行分组
+			Map<String, List<TrunklineCarsOrderVO>> addCarsOrderEntityMap = addCarsOrderEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsOrderVO -> TrunklineCarsOrderVO.getMallName()+"&&"+TrunklineCarsOrderVO.getNodeId()));
+
+			List<TrunklineLoadSignOrderEntity> signOrderEntityList = trunklineLoadSignOrderService.findAllLoadSignOrderList(loadId, warehouseId);
+			//把signOrderEntityList中所有元素转化成mallName和warehouseId作为key的map
+			Map<String, TrunklineLoadSignOrderEntity> signOrderEntityMap = signOrderEntityList.stream().collect(Collectors.toMap(TrunklineLoadSignOrderEntity -> TrunklineLoadSignOrderEntity.getMallName()+"&&"+TrunklineLoadSignOrderEntity.getWarehouseId(), Function.identity(), (k1, k2) -> k1));
+
+			List<TrunklineCarsOrderEntity> updateCarsOrderList = new ArrayList<>();
+
+			Long finalLoadId = loadId;
+			addCarsOrderEntityMap.keySet().forEach(key -> {
+				String[] split1 = key.split("&&");
+				String mallName = split1[0];
+
+				List<TrunklineCarsOrderVO> trunklineCarsOrderVOS = addCarsOrderEntityMap.get(key);
+				Long finalNodeId = trunklineCarsOrderVOS.get(0).getFinalNodeId();
+				TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity = signOrderEntityMap.get(key);
+				if(Objects.isNull(trunklineLoadSignOrderEntity)){
+					trunklineLoadSignOrderEntity = new TrunklineLoadSignOrderEntity();
+					trunklineLoadSignOrderEntity.setLoadId(finalLoadId);
+					trunklineLoadSignOrderEntity.setWarehouseId(warehouseId);
+					trunklineLoadSignOrderEntity.setMallName(mallName);
+					//把trunklineCarsOrderVOS中所有元素的mallPerson去重后用,拼接
+					trunklineLoadSignOrderEntity.setMallPerson(trunklineCarsOrderVOS.stream().map(TrunklineCarsOrderVO::getMallPerson).distinct().collect(Collectors.joining(",")));
+					trunklineLoadSignOrderEntity.setMallMobile(trunklineCarsOrderVOS.stream().map(TrunklineCarsOrderVO::getMallMobile).distinct().collect(Collectors.joining(",")));
+					trunklineLoadSignOrderEntity.setMallAddress(trunklineCarsOrderVOS.stream().map(TrunklineCarsOrderVO::getMallAddress).distinct().collect(Collectors.joining(",")));
+					trunklineLoadSignOrderEntity.setBelongToWarehouseId(warehouseId);
+					trunklineLoadSignOrderEntity.setBelongToWarehouseName(warehouseName);
+					//把trunklineCarsOrderVOS中所有元素的planNum求和
+					trunklineLoadSignOrderEntity.setPlanNum(trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getPlanNum).sum());
+					trunklineLoadSignOrderEntity.setLoadingNum(trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getRealNum).sum());
+					trunklineLoadSignOrderEntity.setSignNum(0);
+					trunklineLoadSignOrderEntity.setSignStatus("0");
+					trunklineLoadSignOrderEntity.setLoadSignCode(codeClient.getCodeByType(CodeNumConstant.TRUNKLINE_LOAD_SIGN, warehouseCode, ""));
+					trunklineLoadSignOrderEntity.setFinalNodeId(finalNodeId);
+				}else{
+					//把trunklineCarsOrderVOS中所有元素的mallPerson去重后放入一个Set
+					Set<String> mallPersonSet = trunklineCarsOrderVOS.stream()
+						.map(TrunklineCarsOrderVO::getMallPerson)
+						.collect(Collectors.toSet());
+					mallPersonSet.add(trunklineLoadSignOrderEntity.getMallName());
+					trunklineLoadSignOrderEntity.setMallPerson(String.join(",",mallPersonSet));
+					Set<String> mallMobileSet = trunklineCarsOrderVOS.stream()
+						.map(TrunklineCarsOrderVO::getMallMobile)
+						.collect(Collectors.toSet());
+					mallMobileSet.add(trunklineLoadSignOrderEntity.getMallMobile());
+					trunklineLoadSignOrderEntity.setMallMobile(String.join(",",mallMobileSet));
+					Set<String> mallAddressSet = trunklineCarsOrderVOS.stream()
+						.map(TrunklineCarsOrderVO::getMallMobile)
+						.collect(Collectors.toSet());
+					mallAddressSet.add(trunklineLoadSignOrderEntity.getMallAddress());
+					trunklineLoadSignOrderEntity.setMallAddress(String.join(",",mallAddressSet));
+					int plan = trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getPlanNum).sum() + trunklineLoadSignOrderEntity.getPlanNum();
+					trunklineLoadSignOrderEntity.setPlanNum(plan);
+					trunklineLoadSignOrderEntity.setLoadingNum(trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getRealNum).sum()+trunklineLoadSignOrderEntity.getLoadingNum());
+					Integer signNum = trunklineLoadSignOrderEntity.getSignNum();
+					if(signNum >= plan){
+						trunklineLoadSignOrderEntity.setSignStatus("20");
+					}else if(signNum == 0){
+						trunklineLoadSignOrderEntity.setSignStatus("0");
+					}else{
+						trunklineLoadSignOrderEntity.setSignStatus("10");
+					}
+				}
+				trunklineLoadSignOrderService.saveOrUpdate(trunklineLoadSignOrderEntity);
+				Long signOrderId = trunklineLoadSignOrderEntity.getId();
+
+
+
+				trunklineCarsOrderVOS.forEach(trunklineCarsOrderVO -> {
+					Long nodeId = trunklineCarsOrderVO.getNodeId();
+					String waybillNo = trunklineCarsOrderVO.getWaybillNo();
+					String orderCode = trunklineCarsOrderVO.getOrderCode();
+					TrunklineCarsOrderEntity updateCarsOrder = new TrunklineCarsOrderEntity();
+					updateCarsOrder.setId(trunklineCarsOrderVO.getId());
+					updateCarsOrder.setNodeId(nodeId);
+					updateCarsOrder.setWaybillNo(waybillNo);
+					updateCarsOrder.setOrderCode(orderCode);
+					updateCarsOrder.setIsCustomer("1");
+					updateCarsOrder.setSignOrderId(signOrderId);
+					updateCarsOrderList.add(updateCarsOrder);
+				});
+
+			});
+
+			if(CollUtil.isNotEmpty(updateCarsOrderList)){
+				trunklineCarsOrderService.updateBatchById(updateCarsOrderList);
+				updateCarsOrderList.forEach(e -> {
+					Long nodeId = e.getNodeId();
+					String orderCode = e.getOrderCode();
+					String waybillNo = e.getWaybillNo();
+					Long signOrderId = e.getSignOrderId();
+					trunklineCarsLoadScanService.addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(finalLoadId, nodeId, orderCode, waybillNo, signOrderId);
+				});
+			}
 
+		}else{
+			//直发商家移除
+			List<Long> dealwithCarsOrderIdList = new ArrayList<>();
+			List<TrunklineCarsOrderEntity> carsOrderEntityList = trunklineCarsOrderService.listByIds(carsOrderIdList);
+			//移除carsOrderEntityList中signNum不为0的元素
+			carsOrderEntityList.removeIf(e -> e.getSignNum() != 0);
+			//把carsOrderEntityList通过signOrderId进行分组
+			Map<Long, List<TrunklineCarsOrderEntity>> collect = carsOrderEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsOrderEntity::getSignOrderId));
+			Set<Long> signOrderIds = collect.keySet();
+			List<TrunklineLoadSignOrderEntity> signOrderEntityList = trunklineLoadSignOrderService.listByIds(signOrderIds);
+			//把signOrderEntityList转化成id为key的Map
+			Map<Long, TrunklineLoadSignOrderEntity> signOrderEntityMap = signOrderEntityList.stream().collect(Collectors.toMap(TrunklineLoadSignOrderEntity::getId, Function.identity()));
+
+
+			List<TrunklineCarsOrderEntity> updateCarsOrderList = new ArrayList<>();
+			List<TrunklineLoadSignOrderEntity> updateSignOrderList = new ArrayList<>();
+			List<Long> delSignOrderList = new ArrayList<>();
+
+			Long finalLoadId1 = loadId;
+			collect.keySet().forEach(signOrderId -> {
+				List<TrunklineCarsOrderEntity> list = collect.get(signOrderId);
+				TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity = signOrderEntityMap.get(signOrderId);
+				//把list中所有元素的realNum求和
+				int sum = list.stream().mapToInt(TrunklineCarsOrderEntity::getRealNum).sum();
+				Integer planNum = trunklineLoadSignOrderEntity.getPlanNum();
+				Integer signNum = trunklineLoadSignOrderEntity.getSignNum();
+				if(sum < planNum){
+					//只是更新不删除
+					TrunklineLoadSignOrderEntity updateSignOrderEntity = new TrunklineLoadSignOrderEntity();
+					updateSignOrderEntity.setId(trunklineLoadSignOrderEntity.getId());
+					int diff = planNum - sum;
+					updateSignOrderEntity.setPlanNum(diff);
+					if(signNum >= diff){
+						updateSignOrderEntity.setSignStatus("20");
+					}else if(signNum == 0){
+						updateSignOrderEntity.setSignStatus("0");
+					}else{
+						updateSignOrderEntity.setSignStatus("10");
+					}
+					updateSignOrderList.add(updateSignOrderEntity);
+				}else{
+					//删除
+					delSignOrderList.add(signOrderId);
 				}
 
-		baseMapper.updateWaybillOrderIsCustemer(carsOrderIdList, isCustomer);
+				list.forEach(e -> {
+					TrunklineCarsOrderEntity carsOrderEntity = new TrunklineCarsOrderEntity();
+					carsOrderEntity.setOrderCode(e.getOrderCode());
+					carsOrderEntity.setWaybillNo(e.getWaybillNo());
+					carsOrderEntity.setLoadId(finalLoadId1);
+					carsOrderEntity.setNodeId(e.getNodeId());
+					updateCarsOrderList.add(carsOrderEntity);
+				});
+
+			});
 
-		//取消节点的签收单
-		cancleCustomerSignOrder(loadId, warehouseId);
+			if(CollUtil.isNotEmpty(updateSignOrderList)){
+				trunklineLoadSignOrderService.updateBatchById(updateSignOrderList);
+			}
+			if(CollUtil.isNotEmpty(delSignOrderList)){
+				trunklineLoadSignOrderService.deleteListBySignOrderIds(delSignOrderList);
+			}
+			if(CollUtil.isNotEmpty(updateCarsOrderList)){
+				//把updateCarsOrderIdList所有的id放入一个List
+				List<Long> updateCarsOrderIdList = updateCarsOrderList.stream().map(TrunklineCarsOrderEntity::getId).collect(Collectors.toList());
+				trunklineCarsOrderService.updateNoCustomer(updateCarsOrderIdList);
+				updateCarsOrderList.forEach(e -> {
+					Long nodeId = e.getNodeId();
+					String orderCode = e.getOrderCode();
+					String waybillNo = e.getWaybillNo();
+					trunklineCarsLoadScanService.clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(finalLoadId1,nodeId,orderCode,waybillNo);
+				});
+			}
+		}
+
+		List<TrunklineLoadSignOrderEntity> signOrderList =trunklineLoadSignOrderService.findSignOrderListByLoadId(loadId);
+		String isCustomer1 = carsLoadEntity.getIsCustomer();
+		if(CollUtil.isNotEmpty(signOrderList)){
+			if("2".equals(isCustomer1)){
+				carsLoadEntity.setIsCustomer("1");
+				updateById(carsLoadEntity);
+			}
+		}else{
+			if("1".equals(isCustomer1)){
 				carsLoadEntity.setIsCustomer("2");
 				updateById(carsLoadEntity);
-
-		//生成直发商家签收单
-		createCustomerSignOrder(loadId, warehouseId);
+			}
+		}
 
 		return R.success("更新成功");
 	}
@@ -4776,12 +4956,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("##############signScanPackageCode: 签收单信息不存在 signOrderId={}", signOrderId);
 			throw new CustomerException(405, "签收单信息不存在");
 		}
-		Integer loadingNum = trunklineCarsOrderService.findLoadingNumBySignOrderId(signOrderId);
+		int loadingNum = trunklineCarsOrderService.findLoadingNumBySignOrderId(signOrderId);
 
-		Integer signNum = trunklineCarsOrderService.findSignNumBySignOrderId(signOrderId);
-		Integer realSignNum = trunklineCarsLoadScanService.findRealSignNumBySignOrderId(signOrderId);
+		int signNum = trunklineCarsOrderService.findSignNumBySignOrderId(signOrderId);
+		int realSignNum = trunklineCarsLoadScanService.findRealSignNumBySignOrderId(signOrderId);
 		signOrderEntity.setSignNum(realSignNum);
-		if (signNum.equals(loadingNum)) {
+		if (signNum >= loadingNum) {
 			signOrderEntity.setSignStatus("20");
 			signOrderEntity.setSignTime(new Date());
 		} else {
@@ -4919,7 +5099,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			Set<Long> loadIds = new HashSet<>();
 			//把list通过signOrderId进行分组
-			Map<Long, List<TrunklineCarsLoadScanVO>> map = list.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getSignOrderId));
+			Map<Long, List<TrunklineCarsLoadScanVO>> map = list.stream().filter(e -> !Objects.isNull(e.getSignOrderId())).collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getSignOrderId));
 			map.keySet().forEach(e -> {
 				List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanVOS = map.get(e);//该签收单对应的包件
 				trunklineCarsLoadScanVOS.forEach(t -> {

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)