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

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

@@ -46,6 +46,7 @@ public enum WorkNodeEnums implements Serializable {
 	SIGN_DIRECT_SHIPPER(105030,"直发商家签收"),
 	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
 	NO_STOCK_CAR(105050, "本车次少货"),
+	NO_DATA(105051, "无效包条码"),
 	COST_SHARE(105060, "车次成本分摊"),
 
 	SORTING_TRAYS(201010, "分拣打托"),

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

@@ -148,7 +148,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						warehousePackageTrackLogEntity.setOrderPackageCode(orderPackageCode);
 						warehousePackageTrackLogEntity.setWarehouseId(abnormalRecordDTO.getWarehouseId());
 						warehousePackageTrackLogEntity.setWarehouseName(abnormalRecordDTO.getWarehouseName());
-						warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode());
+						warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.NO_DATA.getCode());
 						warehousePackageTrackLogEntity.setContent("异常处理已确认为无效包条码");
 						warehousePackageTrackLogEntity.setOperator(AuthUtil.getNickName());
 						List<JSONObject> ls = new ArrayList<>();