From 8f997184b1698d7e28625ddd0df6ae09d496823e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 23 六月 2024 16:58:59 +0800
Subject: [PATCH] 编写RCS任务完成反馈接口
---
Wms/WMS.BLL/BllTransServer/NoticeServer.cs | 59 +++++++++++++++++++++++++++++
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 6 +++
HTML/views/StatisticalReport/BoxInfor.html | 12 ++++++
3 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index c836bcb..55b4d25 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -190,6 +190,17 @@
{{# } else if(d.BitPalletMark == '1') { }}
<p>鏄�</p>
{{# } }}
+ <script type="text/html" id="InspectPalletStatus">
+ {{# if(d.PalletStatus=='0'){ }}
+ <p>鍑�妗�</p>
+ {{# } else if(d.PalletStatus == '1') { }}
+ <p>棰勬贩</p>
+ {{# } else if(d.PalletStatus == '2') { }}
+ <p>鍗婃垚鍝�</p>
+ {{# } else if(d.PalletStatus == '3') { }}
+ <p>鑴忔《</p>
+ {{# } }}
+ </script>
</script>
</div>
</div>
@@ -324,6 +335,7 @@
{field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
+ {field: 'PalletStatus', title: '鎵樼洏鐘舵��', align: 'center', templet: '#InspectPalletStatus'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
//{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index 4a80ebf..8c1860a 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -131,6 +131,12 @@
public DateTime? ExpirationTime { get; set; }
/// <summary>
+ /// 鎵樼洏鐘舵��
+ /// Default:0锛氬噣妗� 1锛氶娣� 2锛氬崐鎴愬搧 3锛氳剰妗�
+ /// </summary>
+ public string PalletStatus { get; set; }
+
+ /// <summary>
/// 鐘舵��
/// </summary>
public string Status { get; set; }
diff --git a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
index c029acf..2a8f453 100644
--- a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -464,12 +464,69 @@
//淇敼璧峰鍌ㄤ綅鐘舵��
Db.Updateable(startLocatInfo).ExecuteCommand();
- endLocatInfo.Status = "1";//绌哄偍浣�
+ endLocatInfo.Status = "1";//鏈夌墿鍝�
//淇敼鐩爣鍌ㄤ綅鐘舵��
Db.Updateable(endLocatInfo).ExecuteCommand();
break;
#endregion
+
+ #region 浠诲姟瀹屾垚
+ case "2":
+ //璧峰鍌ㄤ綅淇℃伅
+ var startLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
+ if (startLocatInfo2 == null)
+ {
+ resultModel.Message = "璧峰鍌ㄤ綅淇℃伅涓嶅瓨鍦�!";
+ return resultModel;
+ }
+ //鐩爣鍌ㄤ綅淇℃伅
+ var endLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
+ if (endLocatInfo2 == null)
+ {
+ resultModel.Message = "鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�!";
+ return resultModel;
+ }
+ //搴撳瓨鏄庣粏
+ var sd3 = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
+ if (sd3 == null)
+ {
+ resultModel.Message = "搴撳瓨淇℃伅涓嶅瓨鍦�!";
+ return resultModel;
+ }
+ sd3.WareHouseNo = endLocatInfo2.WareHouseNo;//鎵�灞炰粨搴�
+ sd3.RoadwayNo = endLocatInfo2.RoadwayNo;//鎵�灞炲贩閬�
+ sd3.AreaNo = endLocatInfo2.AreaNo;//鎵�灞炲尯鍩�
+ sd3.LocatNo = endLocatInfo2.LocatNo;//鍌ㄤ綅鍦板潃
+ if (endLocatInfo2.AreaNo == "A01")//娲佸噣鍖�
+ {
+ sd3.PalletStatus = "0";
+ }
+ else if (endLocatInfo2.AreaNo == "A02")//棰勬贩鍖�
+ {
+ sd3.PalletStatus = "1";
+ }
+ else if (endLocatInfo2.AreaNo == "A03")//鍗婃垚鍝佸尯
+ {
+ sd3.PalletStatus = "2";
+ }
+ else if (endLocatInfo2.AreaNo == "A04")//鑴忔《鍖�
+ {
+ sd3.PalletStatus = "3";
+ }
+
+ //淇敼搴撳瓨鏄庣粏
+ Db.Updateable(sd3).ExecuteCommand();
+
+ startLocatInfo2.Status = "0";//绌哄偍浣�
+ //淇敼璧峰鍌ㄤ綅鐘舵��
+ Db.Updateable(startLocatInfo2).ExecuteCommand();
+
+ endLocatInfo2.Status = "1";//鏈夌墿鍝�
+ //淇敼鐩爣鍌ㄤ綅鐘舵��
+ Db.Updateable(endLocatInfo2).ExecuteCommand();
+ break;
+ #endregion
}
taskInfo.Status = "2";//鎵ц瀹屾垚
//淇敼浠诲姟鐘舵��
--
Gitblit v1.8.0