From 39d468b76e60c05ffcdf749f7ed1d3c443d542f8 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 30 四月 2026 17:13:05 +0800
Subject: [PATCH] 一堆需要求新增及更改
---
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs | 10 +++-------
1 files changed, 3 insertions(+), 7 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..e2fb9ad 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;
@@ -67,11 +63,12 @@
packInfo.AssignNum = 0;
packInfo.ExecutingNum = 0;
packInfo.OverNum = 0;
+ packInfo.HeightNum = 0;
content.Status = BaseDal.UpdateData(packInfo);
//鍚屾椂鍒犻櫎鐮佸灈寰呮墽琛屾槑缁嗚〃
//鍒犻櫎鐮佸灈宸ヤ綅鎵ц鏄庣粏锛屼慨鏀瑰緟鐮佸灈淇℃伅绠辩爜鐘舵�佷负0
- List<Dt_StationPackDetail> stationPackDetails = _stationPackDetailRepository.QueryData(x => x.StationPackId == packInfo.id);
+ List<Dt_StationPackDetail> stationPackDetails = _stationPackDetailRepository.QueryData(x => x.StationPackId == packInfo.Id);
List<string> barCodes = stationPackDetails.Select(x => x.BoxCode).ToList();
List<Dt_Packinfo> packinfos = _packInfoRepository.QueryData(x => barCodes.Contains(x.BarCode)).ToList();
packinfos.ForEach(x => x.PackStatus = 0);//鏀瑰彉鐘舵��
@@ -89,7 +86,6 @@
WebResponseContent.Instance.Error(e.Message);
}
return content;
->>>>>>> main
}
}
}
--
Gitblit v1.9.3