From a34059e688e947a2ea079a0646872f1a21089940 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 22 九月 2025 14:47:00 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 0bc4bf0..a7b5f4a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -2,6 +2,8 @@
using MailKit.Search;
using Mapster;
using Masuit.Tools;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Database;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using System.Diagnostics;
using System.Reflection.Emit;
@@ -11,6 +13,7 @@
using WIDESEA_Core.Const;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
+using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
@@ -38,10 +41,13 @@
private readonly IDt_InWheels_mes_htyRepository _InWheels_Mes_HtyRepository;
private readonly IDt_CacheInfoRepository _CacheInfoRepository;
private readonly IDt_OutWheels_htyRepository _OutWheels_HtyRepository;
+ private readonly IDt_OutZdp_htyRepository _Dt_OutZdp_htyRepository;
private readonly IDt_InZdp_mesRepository _InZdp_MesRepository;
private readonly IDt_InZdp_mes_htyRepository _InZdp_Mes_HtyRepository;
private readonly IDt_ZdpStockRepository _ZdpStockRepository;
private readonly IDt_ZdpStock_htyRepository _ZdpStock_HtyRepository;
+ private readonly IDt_PreOutboundRepository _PreOutboundRepository;
+
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -64,7 +70,9 @@
IDt_InZdp_mesRepository inZdp_MesRepository,
IDt_InZdp_mes_htyRepository inZdp_Mes_HtyRepository,
IDt_ZdpStockRepository zdpStockRepository,
- IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository) : base(BaseDal)
+ IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository,
+ IDt_OutZdp_htyRepository dt_OutZdp_HtyRepository,
+ IDt_PreOutboundRepository dt_PreOutboundRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -85,6 +93,8 @@
_InZdp_Mes_HtyRepository = inZdp_Mes_HtyRepository;
_ZdpStockRepository = zdpStockRepository;
_ZdpStock_HtyRepository = dt_ZdpStock_HtyRepository;
+ _Dt_OutZdp_htyRepository = dt_OutZdp_HtyRepository;
+ _PreOutboundRepository = dt_PreOutboundRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -334,6 +344,8 @@
Wheels_mttype = stock.Wheels_mttype,
//Wheels_SequenceNum = "",
Wheels_ygljz = stock.Wheels_ygljz,
+ Wheels_DateDet = stock.Wheels_DateDet,
+ Wheels_Statue = stock.Wheels_Statue,
};
@@ -419,6 +431,8 @@
Zdp_GKJZ = stock.Zdp_GKJZ,
Zdp_LSCSYMH = stock.Zdp_LSCSYMH,
Zdp_rksj = stock.Zdp_rksj,
+ Zdp_Statue= stock.Zdp_Statue,
+ Zdp_DateDet = stock.Zdp_DateDet,
};
// 浜嬪姟澶勭悊
@@ -429,6 +443,8 @@
//var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
var isStockHtyAdd = await _ZdpStock_HtyRepository.AddDataAsync(stockInfo_Hty); //鍔犲叆鍘嗗彶搴撳瓨
+
+ var isoutZDPHtyAdd = await _Dt_OutZdp_htyRepository.AddDataAsync(Outwheels_hty); //娣诲姞杞﹁疆鍑哄簱淇℃伅
});
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -701,7 +717,7 @@
SourceAddress = zdpInfo.Zdp_Location,
CurrentAddress =zdpInfo.Zdp_Location,
TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = outtype == "2" ? (int)TaskOutboundTypeEnum.OutBrake : (int)TaskOutboundTypeEnum.OutWheels,
+ TaskType = (int)TaskOutboundTypeEnum.OutBrake,
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System",
CreateDate = DateTime.Now,
@@ -726,6 +742,14 @@
{
Dt_WheelsStock stockInfo = _WheelsStockRepository.QueryFirst(x => x.Wheels_code == item);
if (stockInfo == null) return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+
+ Dt_PreOutbound dt_Pre=_PreOutboundRepository.QueryFirst(x => x.PalletCode == stockInfo.Wheels_code);
+ if (dt_Pre != null)
+ {
+ return content.Error($"褰撳墠杞﹁疆鍙峰凡鍦ㄦ殏瀛樺嚭搴撲腑锛屼笉鍙洿鎺ュ嚭搴擄紒锛侊紒锛岃溅杞潯鐮侊細{dt_Pre.PalletCode}");
+ }
+
+
stockInfo.Wheels_CurrentStatue = 4;
string Location = stockInfo.Wheels_Location;
var locationst = locationinfoData.Where(x => x.LocationCode== stockInfo.Wheels_Location).FirstOrDefault();
@@ -1121,6 +1145,7 @@
var wheels_Mes_Hty = inWheels_Mes.Adapt<Dt_InWheels_mes_hty>();
+ wheels_Mes_Hty.Wheels_Type = "杞�";
wheels_Mes_Hty.Wheels_CurrentStatue = "2";
wheels_Mes_Hty.FinishDate = DateTime.Now;
wheels_Mes_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
@@ -1410,4 +1435,21 @@
#endregion 浠诲姟璇锋眰鏂规硶
#endregion private 鍐呴儴鏂规硶
+
+
+
+ public WebResponseContent GetStockStatue()
+ {
+ WebResponseContent content=new WebResponseContent();
+ int Wherecount = _WheelsStockRepository.QueryData(x => x.Wheels_Statue == 1).Count();
+
+ int Zdpcount = _ZdpStockRepository.QueryData(x => x.Zdp_Statue == 1).Count();
+
+ content.Data = new
+ {
+ WheelsCount = Wherecount,
+ ZdpCount = Zdpcount
+ };
+ return content;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3