1.干线bug修复

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

@@ -222,4 +222,7 @@ public interface IDistributionStockArticleClient {
 
 	@PostMapping(API_PREFIX + "/findWaybillNoByOrderIds")
     List<DistributionStockArticleEntity> findWaybillNoByOrderIds(@RequestBody Set<Long> stockArticleIds);
+
+	@PostMapping(API_PREFIX + "/updateEntity")
+	void updateEntity(@RequestBody DistributionStockArticleEntity stockArticleEntity);
 }

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

@@ -160,7 +160,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						abnormalRecordEntity.setRemark("本车次少货("+upWarehouseName+" "+AuthUtil.getNickName()+")");
 
 					}else if(dealType.equals(4)){
-						Long warehouseId = abnormalRecordDTO.getWarehouseId();
+						Long warehouseId = abnormalRecordEntity.getWarehouseId();
 						R r = trunklineCarsLoadScanClient.adnormalHasStock(carsLoadScanId,warehouseId);
 						int code = r.getCode();
 						if(code != 200){

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

@@ -451,4 +451,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		return distributionParcelListService.findWaybillNoByOrderIds(stockArticleIds);
 	}
 
+	@Override
+	public void updateEntity(DistributionStockArticleEntity stockArticleEntity) {
+		distributionStockArticleService.updateById(stockArticleEntity);
+	}
+
 }

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

@@ -589,6 +589,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			orderId = stockArticleClient.addData(stockArticleEntity);
 		} else {
 			stockArticleEntity.setTotalNumber(total);
+			stockArticleEntity.setGenre(1);
 			stockArticleClient.saveOrUpdate(stockArticleEntity);
 			orderId = stockArticleEntity.getId();
 
@@ -930,6 +931,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 				}
 			} else {
 				stockArticleEntity.setTotalNumber(total);
+				stockArticleEntity.setGenre(1);
 				updateStockArticleEntities.add(stockArticleEntity);
 			}
 		});

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

@@ -3589,6 +3589,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					carsLoadScanEntity.setWaybillNo(trunklineAdvanceDetailEntity.getWaybillNo());
 					carsLoadScanEntity.setWaybillId(trunklineAdvanceDetailEntity.getWaybillId());
 					carsLoadScanEntity.setIsData(1);
+					carsLoadScanEntity.setFromWarehouseId(trunklineAdvanceDetailEntity.getNowWarehouseId());
 					String packageStatus = trunklineAdvanceDetailEntity.getPackageStatus();
 					if ("0".equals(packageStatus)) {
 						//未入库
@@ -8881,7 +8882,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		//查询包件是否签收
 		DistributionParcelListEntity signDistributionParcelListEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode,"70");
-		if (!Objects.isNull(distributionParcelListEntity)) {
+		if (!Objects.isNull(signDistributionParcelListEntity)) {
 			log.warn("##############unloadPackage: 包件已签收 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
 			return R.fail(405, "包件已签收");
 		}
@@ -9051,6 +9052,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							currentStockArticleEntity.setId(null);
 							currentStockArticleEntity.setWarehouseId(warehouseId);
 							currentStockArticleEntity.setWarehouse(warehouseName);
+							currentStockArticleEntity.setGenre(1);
 							currentStockArticleEntity.setHandQuantity(0);
 							currentStockArticleEntity.setCompleteSet(1);
 							currentStockArticleEntity.setStockupStatus("10");
@@ -9070,6 +9072,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							currentStockArticleEntity.setId(currentOrderId);
 						} else {
 							currentOrderId = currentStockArticleEntity.getId();
+							currentStockArticleEntity.setGenre(1);
+							distributionStockArticleClient.updateEntity(currentStockArticleEntity);
 						}
 
 						//判断包件当前仓是否是目的仓
@@ -9248,12 +9252,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					currentStockArticleEntity.setTransferQuantity(0);
 					currentStockArticleEntity.setSigninQuantity(0);
 					currentStockArticleEntity.setIncomingNum(0);
+					currentStockArticleEntity.setGenre(1);
 					currentStockArticleEntity.setAllocation(null);
 					currentStockArticleEntity.setTrays(null);
 					currentOrderId = distributionStockArticleClient.addData(currentStockArticleEntity);
 					currentStockArticleEntity.setId(currentOrderId);
 				} else {
 					currentOrderId = currentStockArticleEntity.getId();
+					stockArticleEntity.setGenre(1);
+					distributionStockArticleClient.updateEntity(stockArticleEntity);
 				}
 
 				//判断包件当前仓是否是目的仓
@@ -9406,6 +9413,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						stockArticleEntity.setId(currentOrderId);
 					} else {
 						currentOrderId = stockArticleEntity.getId();
+						stockArticleEntity.setGenre(1);
+						distributionStockArticleClient.updateEntity(stockArticleEntity);
 					}
 
 					//判断包件当前仓是否是目的仓
@@ -9639,7 +9648,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		//查询包件是否签收
 		DistributionParcelListEntity signDistributionParcelListEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode,"70");
-		if (!Objects.isNull(distributionParcelListEntity)) {
+		if (!Objects.isNull(signDistributionParcelListEntity)) {
 			log.warn("##############unloadPackage: 包件已签收 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
 			return R.fail(405, "包件已签收");
 		}
@@ -9668,6 +9677,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			.eq("scan_code", orderPackageCode)
 			.eq("scan_status","1");
 		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
+
+//		if(Objects.isNull(carsLoadScanEntity)){
+//			QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper1 = new QueryWrapper<>();
+//			loadScanQueryWrapper1.eq("load_id", loadId)
+//				.eq("scan_code", orderPackageCode)
+//				.eq("scan_status","2")
+//				.eq("unload_node_id", warehouseId);
+//			carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
+//		}
+
+
 		//判断是否有装车扫描记录
 		if (Objects.isNull(carsLoadScanEntity)) {
 			//没有装车扫码记录