Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -13,8 +13,12 @@ import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
+import com.logpm.trunkline.dto.AddWaybillTrackDTO;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
 import com.logpm.trunkline.feign.ITrunklineCarsLoadScanClient;
+import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.utils.CommonUtil;
@@ -43,6 +47,10 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 
 	private final IDistributionParcelListClient parcelListClient;
 
+	private final IWarehouseWaybillClient warehouseWaybillClient;
+
+	private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient;
+
 	@Override
 	public R findPageList(AbnormalRecordDTO abnormalRecordDTO) {
 		IPage<Object> page = new Page<>();
@@ -268,7 +276,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 									}
 								}else{
 
-									stockArticleClient.addHandQuantity(currentStockArticleEntity.getId(),enterNum);
+									stockArticleClient.addHandQuantityAndIncomingNum(currentStockArticleEntity.getId(),enterNum);
 
 								}
 								abnormalRecordEntity.setRemark("差异"+enterNum+"件数入库本仓,原仓返回"+diff+"件");
@@ -276,6 +284,28 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 							carsLoadScanEntity.setScanStatus("2");
 							carsLoadScanEntity.setUnloadNum(carsLoadScanEntity.getUnloadNum()+enterNum);
 							trunklineCarsLoadScanClient.updateEntity(carsLoadScanEntity);
+
+							String waybillNo = carsLoadScanEntity.getWaybillNo();
+							WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+							Long waybillId = null;
+							if(!Objects.isNull(waybillEntity)){
+								waybillId = waybillEntity.getId();
+							}
+
+							String warehouseName = warehouseEntity.getName();
+
+							String operationRemark = warehouseName+"干线异常列表卸车，总数/卸车数："+num+"/"+enterNum+"，卸车时间"+ CommonUtil.dateToStringGeneral(new Date());
+							AddWaybillTrackDTO addWaybillTrackDTO = new AddWaybillTrackDTO();
+							addWaybillTrackDTO.setTrackType("80");
+							addWaybillTrackDTO.setWaybillId(waybillId);
+							addWaybillTrackDTO.setWaybillNo(waybillNo);
+							addWaybillTrackDTO.setRefer("异常列表卸车");
+							addWaybillTrackDTO.setOperationRemark(operationRemark);
+							addWaybillTrackDTO.setUserId(AuthUtil.getUserId());
+							addWaybillTrackDTO.setWarehouseId(warehouseId);
+							addWaybillTrackDTO.setWarehouseName(warehouseName);
+							addWaybillTrackDTO.setNickName(AuthUtil.getNickName());
+							trunklineWaybillTrackClient.addWaybillLog(addWaybillTrackDTO);
 						}
 					}
 				}

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

@@ -5579,7 +5579,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					warehousePackageTrackLogEntity.setWarehouseId(warehouseId);
 					warehousePackageTrackLogEntity.setWarehouseName(warehouseName);
 					warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode());
-					String content = "包件在 " + warehouseName + "手动批量装车,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + warehouseName;
+					String content = "包件在 " + warehouseName + "手动批量装车,车次号:"+carsNo+",配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + warehouseName;
 					warehousePackageTrackLogEntity.setContent(content);
 					warehousePackageTrackLogEntity.setOperator(nickName);
 					addPackageTrackLogList.add(warehousePackageTrackLogEntity);

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

@@ -203,6 +203,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 			packageStatus = 10;
 		}
 
+		if(CollUtil.isNotEmpty(orderPackageCodes)){
 			if(!Objects.isNull(packageStatus)){
 				List<TrunklineWaybillPackageEntity> waybillPackageEntities = new ArrayList<>();
 				Set<Long> waybillIds = new HashSet<>();
@@ -226,6 +227,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 			}
 
 			packageTrackLogAsyncService.sendPackageWorkNodeFanout(orderPackageCodes,workNode,warehouseId, map);
+		}
 
 	}
 }