From d41acebbd89f171b0eeb205fca4f68043ca85f95 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期三, 03 十二月 2025 19:47:24 +0800
Subject: [PATCH] 选配与暂存
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
index c82bffb..59eed5b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Masuit.Tools;
+using Newtonsoft.Json;
using SharpCompress.Compressors.Xz;
using System.Reflection.Emit;
using WIDESEA_Common;
@@ -24,9 +25,14 @@
/// <returns></returns>
public WebResponseContent SaveCZInfo(SaveModel saveModel)
{
+
WebResponseContent content = new WebResponseContent();
try
{
+ string CZjson = Newtonsoft.Json.JsonConvert.SerializeObject(saveModel, Newtonsoft.Json.Formatting.Indented);
+ // 鎻愬彇浠诲姟鏁版嵁
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱鎺ユ敹杞﹁酱鏁版嵁").Info(true, $"杞﹁酱浼犻�掔殑鏁版嵁锛歿CZjson}");
+
//濡傚綋鍓嶅瓨鍦ㄦ湭寮�濮嬪叆搴撶殑杞﹁疆鎴栧埗鍔ㄧ洏鏁版嵁,鍒欑姝繚瀛樻柊鏁版嵁 浠ラ槻鏁版嵁娣蜂贡
var waitInbound = _CZInfo_MesRepository.QueryFirst(x => x.CurrentStatue == "0");
if (waitInbound != null) throw new Exception("褰撳墠瀛樺湪鏈紑濮嬪叆搴撶殑杞﹁酱鏁版嵁,璇峰厛涓婃灦鍚姩鍚庡啀淇濆瓨淇℃伅!");
@@ -220,8 +226,11 @@
YLZZJ = ylzzj,
ZLZDJ = leftLevel,
YLZDJ = rightLevel,
- WXRW = wxrw
+ WXRW = wxrw,
+ TemporaryState=0,
};
+
+
//宸﹀嚭搴撹溅杞�
Dt_WheelsStock leftContainer = null;
@@ -240,42 +249,71 @@
//M1C 瀵瑰簲 杞﹀瀷 CRH1C CRH1A-A
if (czxh == "M1A")
{
- WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1A" || x.Wheels_CarType == "CRH1A-200") && x.Wheels_Statue==0);
+ if (CZInfo_Mes.MTTYPE == "T")
+ {
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && (x.Wheels_CarType == "CRH1A" || x.Wheels_CarType == "CRH1A-200") && x.Wheels_Statue == 0);
+ }
+ else
+ {
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1A" || x.Wheels_CarType == "CRH1A-200") && x.Wheels_Statue == 0);
+ }
+
}
- else if(czxh == "M1B")
+ else if (czxh == "M1B")
{
- WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1B" || x.Wheels_CarType == "CRHA1A-250") && x.Wheels_Statue == 0);
+ if (CZInfo_Mes.MTTYPE == "T")
+ {
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && (x.Wheels_CarType == "CRH1B" || x.Wheels_CarType == "CRHA1A-250") && x.Wheels_Statue == 0);
+ }
+ else
+ {
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1B" || x.Wheels_CarType == "CRHA1A-250") && x.Wheels_Statue == 0);
+ }
+
}
else if (czxh == "M1C")
{
- WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0);
- }
- else
- {
-
if (CZInfo_Mes.MTTYPE == "T")
{
- //鍘绘帀浜嗗睘鎬у姣�
- WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.Wheels_Statue == 0);
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0);
}
else
{
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0);
+ }
+ }
+
+ else
+ {
+ if (CZInfo_Mes.MTTYPE == "T")
+ {
+ //鎵惧嚭鎵�鏈夌鍚堟潯浠剁殑搴撳瓨杞﹁疆
+ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.Wheels_Statue == 0);
+ }
+ else
+ {
+ //鎵惧嚭鎵�鏈夌鍚堟潯浠剁殑搴撳瓨杞﹁疆
WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && x.Wheels_Statue == 0);
}
-
}
- if(newOrOld=="1")
+ if (newOrOld=="1")
{
- foreach (var item in WheelsList)
+ //foreach (var item in WheelsList)
+ //{
+ // decimal ygrjz = decimal.Parse(item.Wheels_ygljz);
+ // if (ygrjz < zuixiaoz || ygrjz > zuidaz)
+ // WheelsList.Remove(item);
+ //}
+ foreach (var item in WheelsList.ToList())
{
decimal ygrjz = decimal.Parse(item.Wheels_ygljz);
if (ygrjz < zuixiaoz || ygrjz > zuidaz)
- WheelsList.Remove(item);
+ WheelsList.Remove(item);
}
}
@@ -335,6 +373,7 @@
List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
List<Dt_WheelsStock> wheelsStocks = new List<Dt_WheelsStock>();
List<WMSTaskDTO> listTaskDTO = new List<WMSTaskDTO>();
+
if (null != leftContainer)
{
Dt_Task leftTask = CreateOutTask(leftContainer, czCode);
@@ -385,6 +424,8 @@
listTaskDTO.Add(leftTaskDTO);
wheelsStocks.Add(leftContainer);
locationInfos.Add(lefolocation);
+ CZInfo_Mes.LeftCLTM = leftContainer.Wheels_Num;
+ CZInfo_Mes.LeftCLinterference= (decimal.Parse(CZInfo_Mes.ZLZZJ) -decimal.Parse(leftContainer.Wheels_gkcc)).ToString();
}
if (null != rightContainer)
{
@@ -433,6 +474,8 @@
listTaskDTO.Add(rihgtTaskDTO);
wheelsStocks.Add(rightContainer);
locationInfos.Add(rightlocation);
+ CZInfo_Mes.RightCLTM = rightContainer.Wheels_Num;
+ CZInfo_Mes.RightCLinterference = (decimal.Parse(CZInfo_Mes.YLZZJ) - decimal.Parse(rightContainer.Wheels_gkcc)).ToString();
}
_unitOfWorkManage.BeginTran(); //寮�鍚簨鍔�
@@ -468,6 +511,18 @@
WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
if (respone.Status)
{
+
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱").Info(true, $"\r\r-----------------------------------------------------------");
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱").Info(true, $"杞﹁酱缂栧彿锛歿CZInfo_Mes.CZH}");
+ // 鎻愬彇浠诲姟鏁版嵁
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱").Info(true, $"杞﹁酱浼犻�掔殑鏁版嵁锛歿CZjson}");
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱").Info(true, $"\r\r>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱").Info(true, $"绛涢�夌殑杞﹁疆鏁版嵁锛歿wheelsStocks.ToJsonString()}");
+ LogFactory.GetLog("杞﹁疆閫夐厤鍑哄簱").Info(true, $"\r\r-----------------------------------------------------------");
+
+
+
_unitOfWorkManage.CommitTran(); //鎻愪氦浜嬪姟
content.OK($"杞﹁疆鍑哄簱浠诲姟涓嬪彂缁橶CS鎴愬姛.");
}
--
Gitblit v1.9.3