Merge branch 'pre-production'

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -116,12 +116,13 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 		List<Long> abnormalRecordIds = abnormalRecordDTO.getAbnormalRecordIds();
 		List<AftersalesAbnormalRecordEntity> abnormalRecordEntityList = baseMapper.selectBatchIds(abnormalRecordIds);
 		if(CollUtil.isNotEmpty(abnormalRecordIds)){
-			abnormalRecordEntityList.forEach(abnormalRecordEntity -> {
+
+			for (AftersalesAbnormalRecordEntity abnormalRecordEntity : abnormalRecordEntityList) {
 				Long abnormalRecordId = abnormalRecordEntity.getId();
 				Integer abnormalStatus = abnormalRecordEntity.getAbnormalStatus();
 				if(abnormalStatus.equals(1)){
 					log.warn("################dealAbnormal: 异常已完结");
-					throw new CustomerException(405,"异常已完结");
+					continue;
 				}
 				String abnormalType = abnormalRecordEntity.getAbnormalType();
 				String upWarehouseName = abnormalRecordEntity.getWarehouseName();
@@ -141,7 +142,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						R r = trunklineCarsLoadScanClient.incomingPackage(carsLoadScanId);
 						int code = r.getCode();
 						if(code != 200){
-							throw new CustomerException(405,"入库失败");
+							continue;
 						}
 
 						//发送异常列表包件入库
@@ -163,7 +164,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						R r = trunklineCarsLoadScanClient.adnormalHasStock(carsLoadScanId,warehouseId);
 						int code = r.getCode();
 						if(code != 200){
-							throw new CustomerException(405,"入库失败");
+							continue;
 						}
 
 						//已入库
@@ -488,7 +489,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 				abnormalRecordEntity.setDealUserId(AuthUtil.getUserId());
 				abnormalRecordEntity.setDealUserName(AuthUtil.getNickName());
 				updateById(abnormalRecordEntity);
-			});
+			}
 		}
 		return R.success("处理成功");
 	}

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

@@ -758,8 +758,6 @@
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
-        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no
-        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
@@ -860,7 +858,6 @@
             <if test="par.customerAddress !=null  and par.customerAddress !=''">
                 and ldsa.customer_address like concat('%',#{par.customerAddress},'%')
             </if>
-            AND lww.check_status = 1
         </where>
         ORDER BY
         ldsa.warehouse_entry_time DESC

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java

@@ -21,7 +21,7 @@ public enum FactoryNodeEnums {
 	/**
 	 * 包件入库
 	 */
-	END_WAREHOUSE_UNLOADING(105010,"包件入库", 1)
+	END_WAREHOUSE_UNLOADING(105010,"包件入库", 1),
 	;
 
 	private Integer code;

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java

@@ -21,6 +21,7 @@ public enum NodeMappingEnums {
 	 * 包件入库
 	 */
 	END_WAREHOUSE_UNLOADING(FactoryNodeEnums.END_WAREHOUSE_UNLOADING, WorkNodeEnums.END_WAREHOUSE_UNLOADING, 1),
+	UNLOAD_INCOMING_WAREHOUSE(FactoryNodeEnums.END_WAREHOUSE_UNLOADING, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE, 1),
 	;
 
 	/**

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java

@@ -21,6 +21,7 @@ public enum NodeNeedEnums implements Serializable {
 	 * 包件入库
 	 */
 	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
+	UNLOAD_INCOMING_WAREHOUSE(105010, "末端仓卸车确认"),
 	;
 
 	private Integer code;

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

@@ -93,6 +93,10 @@ public class NodeDataPushListener {
 		// 3 拿到所有必推节点的code
 		List<Integer> mustPushCode = FactoryNodeEnums.getMustPushCode();
 		if (CollUtil.isNotEmpty(content)) {
+			// 卸车扫描节点 判断是否是末端仓卸车，末端仓卸车推送的数据推送
+			if (NodeNeedEnums.UNLOAD_INCOMING_WAREHOUSE.getCode().equals(workNodeEnums.getCode())) {
+				content = content.stream().filter(item -> ObjectUtil.equal(item.getWarehouseName(), item.getDestinationWarehouse())).collect(Collectors.toList());
+			}
 			// 查询出本次操作的所有订单
 			Set<String> orderCodes = content.stream().map(PushData::getOrderCode).collect(Collectors.toSet());
 			if (CollUtil.isEmpty(orderCodes)) {
@@ -136,9 +140,9 @@ public class NodeDataPushListener {
 					return;
 				}
 				// 订单 warehouse 不为空为干线，否则为仓配，推送干线的同时回推仓配
-				Map<String, String> orderCodeMap = orderDetailEntities.stream().collect(Collectors.toMap(PushOrderDetailEntity::getOrderId, PushOrderDetailEntity::getCustomItemNo));
+				// Map<String, String> orderCodeMap = orderDetailEntities.stream().collect(Collectors.toMap(PushOrderDetailEntity::getOrderId, PushOrderDetailEntity::getCustomItemNo));
 				Map<String, PushOrderDetailEntity> detailEntityMap = orderDetailEntities.stream().collect(Collectors.toMap(PushOrderDetailEntity::getCustomItemNo, v -> v));
-				List<String> orderIds = orderDetailEntities.stream().map(PushOrderDetailEntity::getOrderId).collect(Collectors.toList());
+				// List<String> orderIds = orderDetailEntities.stream().map(PushOrderDetailEntity::getOrderId).collect(Collectors.toList());
 				// Map<String, PushOrderEntity> pushOrderEntityMap = new HashMap<>();
 				// if (CollUtil.isNotEmpty(orderIds)) {
 					// List<PushOrderEntity> pushOrderEntities = pushOrderService.listByIds(orderIds);
@@ -162,8 +166,8 @@ public class NodeDataPushListener {
 					}
 					JSONObject mainJson = JSONUtil.parseObj(main);
 					// 到站 一个订单只发送一次
-					for (String orderCode : orderCodes) {
+					// for (String orderCode : orderCodes) {
-						if (pushEntityMap.containsKey(orderCode)) {
+						if (pushEntityMap.containsKey(sendOrderCode)) {
 							continue;
 						}
 						String arriveFor = "carrier";
@@ -171,7 +175,7 @@ public class NodeDataPushListener {
 						if (ObjectUtil.isNotEmpty(pushOrderEntity) && StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
 							arriveFor = "stock";
 						}
-						PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(orderCode);
+						PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(sendOrderCode);
 						String boxCodeList = pushOrderDetailEntity.getBoxCodeList();
 						JSONArray boxCodeListJson = JSONUtil.parseArray(boxCodeList);
 						// JSONArray details = new JSONArray();
@@ -181,9 +185,9 @@ public class NodeDataPushListener {
 							detail.set(item.toString(), 1);
 							// details.add(jsonObject);
 						});
-						if (!CollUtil.contains(pushEntityMap.keySet(), orderCode)) {
+						if (!CollUtil.contains(pushEntityMap.keySet(), sendOrderCode)) {
 							JSONObject js = new JSONObject();
-							js.set("extOrderNo", orderCode);
+							js.set("extOrderNo", sendOrderCode);
 							js.set("extWaybillNO", mainJson.getStr("serviceNumber"));
 							js.set("detail", detail);
 							// js.set("shipNo", mainJson.getStr("waybillNumber"));
@@ -214,7 +218,7 @@ public class NodeDataPushListener {
 									log.info("推送工厂结果：{}", result);
 									// 保存推送记录
 									factoryNodePushService.save(FactoryNodePushEntity.builder()
-										.orderCode(orderCode)
+										.orderCode(sendOrderCode)
 										.node(FactoryNodeEnums.FINAL_NET_ARRIVE_CAR.getCode().toString())
 										.content(JSONUtil.toJsonStr(js))
 										.resultContent(result)
@@ -224,7 +228,7 @@ public class NodeDataPushListener {
 								log.error("推送工厂失败：{}", e);
 							}
 						}
-					}
+					// }
 				} else {
 					// 入库一个包件一次
 					Map<String, FactoryNodePushEntity> pushEntityMap = new HashMap<>();

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

@@ -175,7 +175,7 @@
         select ltco.order_code orderCode,
                ltco.waybill_no waybillNo,
                ltco.plan_num planNum,
-        sum(IF(ltcls.loading_abnormal is null or ltcls.loading_abnormal = '1',0,ltcls.num)) as loadingNum,
+        sum(IF(ltcls.loading_abnormal is null or ltcls.scan_status = '2',0,ltcls.num)) as loadingNum,
                lww.check_user_name checkUserName,
                IFNULL(sum(ltcls.unload_num),0) unloadNum,
                IFNULL(lww.total_freight/lww.total_count*ltwo.total_number,0) orderFreight,

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

@@ -512,11 +512,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					.warehouse(warehouseEntity.getName())
 					.startWarehouse(brand.getStartWarehouseName())
 					.endWarehouse(brand.getEndWarehouseName())
-					.content(StrUtil.split(packageCode, ",").stream().map(data->{
+					.content(value.stream().map(data->{
 						return PushData.builder()
-							.packageCode(data)
+							.packageCode(data.getPackageCode())
 							.warehouseName(warehouseEntity.getName())
-							.orderCode(brand.getOrderCode())
+							.orderCode(data.getOrderCode())
 							.build();
 					}).collect(Collectors.toList()))
 					.build();