From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新
---
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs"
index 1717362..74cea7d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs"
@@ -15,19 +15,27 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IPackInfoService;
+<<<<<<< HEAD
+=======
using WIDESEAWCS_IBasicInfoRepository;
+>>>>>>> main
namespace WIDESEAWCS_PackInfoService
{
public class PackaxisService : ServiceBase<Dt_Packaxis, IPackaxisRepository>, IPackaxisService
{
+<<<<<<< HEAD
+ public PackaxisService(IPackaxisRepository BaseDal) : base(BaseDal)
+ {
+=======
private readonly IPackTypeRepository _packTypeRepository;
private readonly IStationMangerRepository _stationMangerRepository;
public PackaxisService(IPackaxisRepository BaseDal, IPackTypeRepository packTypeRepository, IStationMangerRepository stationMangerRepository) : base(BaseDal)
{
_packTypeRepository = packTypeRepository;
_stationMangerRepository = stationMangerRepository;
+>>>>>>> main
}
public override WebResponseContent Import(List<IFormFile> files)
{
@@ -62,7 +70,11 @@
using (ImportExcelHelper excelHelper = new ImportExcelHelper(fullPath))
{
dtExcel = excelHelper.ExcelToDataTable();
+<<<<<<< HEAD
+
+=======
+>>>>>>> main
}
List<Dt_Packaxis> addAxis = new List<Dt_Packaxis>();
List<Dt_Packaxis> updateAxis = new List<Dt_Packaxis>();
@@ -88,7 +100,11 @@
string AxisZCount = row["AxisZCount"]?.ToString() ?? string.Empty;
string AxisZSpacing = row["AxisZSpacing"]?.ToString() ?? string.Empty;
var axis = BaseDal.QueryFirst(x => x.DeviceCode == DeviceCode && x.StationCode == StationCode && x.PackType == PackType);
+<<<<<<< HEAD
+ if(axis == null)
+=======
if (axis == null)
+>>>>>>> main
{
Dt_Packaxis packaxis = new Dt_Packaxis()
{
@@ -142,6 +158,8 @@
return content;
}
+<<<<<<< HEAD
+=======
/// <summary>
/// 娣诲姞鍧愭爣鏁版嵁
/// </summary>
@@ -246,5 +264,6 @@
return content;
}
+>>>>>>> main
}
}
--
Gitblit v1.9.3