From 3571d8b2231e06e46774af86be502014d6974e1d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 07 四月 2026 16:16:53 +0800
Subject: [PATCH] 优化ERP接收单据逻辑，一期领料变更逻辑修改
---
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
index 23dd1b4..639a8f0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
@@ -7,7 +7,6 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-<<<<<<< HEAD
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
@@ -16,7 +15,6 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IPackInfoService;
-=======
using WIDESEAWCS_Common.Utilities;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -27,16 +25,14 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_PackInfoRepository;
->>>>>>> main
namespace WIDESEAWCS_PackInfoService
{
public class StationPackInfoService : ServiceBase<Dt_StationPackInfo, IStationPackInfoRepository>, IStationPackInfoService
{
-<<<<<<< HEAD
public StationPackInfoService(IStationPackInfoRepository BaseDal) : base(BaseDal)
{
-=======
+ }
private readonly IStationPackDetailRepository _stationPackDetailRepository;
private readonly IPackinfoRepository _packInfoRepository;
private readonly IPackaxisTaskRepository _packaxisTaskRepository;
@@ -89,7 +85,6 @@
WebResponseContent.Instance.Error(e.Message);
}
return content;
->>>>>>> main
}
}
}
--
Gitblit v1.9.3