From c161ac4116646f85b59cc5d684005982ac92936e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 25 六月 2024 15:08:49 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/UpApiController.cs | 2 +-
Wms/WMS.BLL/BllTransServer/NoticeServer.cs | 27 ++++++++++-----------------
HTML/views/StatisticalReport/BoxInfor.html | 14 +++++++++++++-
HTML/views/SOSetting/ExportNotice.html | 10 +++++-----
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index f04eecd..d60146e 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -472,12 +472,12 @@
var TotalColsArr = [[
{ field: '', title: '搴忓彿', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
{ field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 165, "disabled": true },
- { field: 'Type', title: '鍗曟嵁绫诲瀷', align: 'center', templet: '#templetType' },
+ //{ field: 'Type', title: '鍗曟嵁绫诲瀷', align: 'center', templet: '#templetType' },
{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', templet: '#templetStatus' },
// { field: 'LogisticsName', title: '鎵胯繍鍟�', align: 'center' },
// { field: 'CustomerName', title: '瀹㈡埛鍚嶇О', align: 'center' },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center' },
- { field: 'LotNoText', title: '鎵规鎻忚堪', align: 'center' },
+ //{ field: 'LotNo', title: '鎵规鍙�', align: 'center' },
+ //{ field: 'LotNoText', title: '鎵规鎻忚堪', align: 'center' },
//{ field: 'IsDespatch', title: '鏄惁鍙戣繍', align: 'center', templet: '#templetIsDespatch' },
//{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' },
{ field: 'Origin', title: '鏉ユ簮', align: 'center' },
@@ -488,7 +488,7 @@
{ field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', templet: '#templetUpdateTime' },
{ field: 'CheckUserName', title: '澶嶆牳浜�', align: 'center', width: 110 },
{ field: 'CheckTime', title: '澶嶆牳鏃堕棿', align: 'center', templet: '#templetCheckTime' },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', width: 200, toolbar: '#table-content-list', "disabled": false }
+ //{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', width: 200, toolbar: '#table-content-list', "disabled": false }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -771,7 +771,7 @@
//{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 120 },
//{ field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
//{ field: 'Money', title: '鎬婚噾棰�', align: 'center', width: 90 },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
+ //{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index cae96ef..062d0ee 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -205,9 +205,20 @@
}
return html;
}
- }}
+ }}
{{ GetBtn11(d) }}
</script>
+ <script type="text/html" id="InspectStatus1">
+ {{# if(d.InspectStatus == '0') { }}
+ <p>寰呮楠�</p>
+ {{# } else if(d.InspectStatus == '1'){ }}
+ <p>妫�楠屽悎鏍�</p>
+ {{# } else if(d.InspectStatus == '2'){ }}
+ <p>涓嶅悎鏍�</p>
+ {{# } else if(d.InspectStatus == '4') { }}
+ <p>鏀剧疆鏈�</p>
+ {{# } }}
+ </script>
<script type="text/html" id="toolbarDemo">
<button class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" lay-event="add">
@@ -360,6 +371,7 @@
{field: 'Qty', title: '鏁伴噺', align: 'center'},
{field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
+ {field: 'InspectStatus', title: '璐ㄦ鐘舵��', align: 'center', templet: '#InspectStatus1'},
//{field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
//{field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
]];
diff --git a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
index 9887f0a..bf77fa2 100644
--- a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -232,7 +232,7 @@
IsBale = "0",
IsBelt = "0",
- PalletStatus = "1",
+ PalletStatus = "2",
IsDel = "0",
CreateUser = 0,
@@ -255,7 +255,7 @@
sd1.LocatNo = locatInfo.LocatNo;//鍌ㄤ綅鍦板潃
sd1.CompleteTime = comTime;
sd1.InspectStatus = "0";//寰呮楠�
- sd1.PalletStatus = "1";//棰勬贩
+ sd1.PalletStatus = "2";//鍗婃垚鍝�
//淇敼搴撳瓨鏄庣粏
Db.Updateable(sd1).ExecuteCommand();
@@ -414,13 +414,6 @@
resultModel.Message = "璧峰鍌ㄤ綅淇℃伅涓嶅瓨鍦�!";
return resultModel;
}
- //鐩爣鍌ㄤ綅淇℃伅
- var endLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
- if (endLocatInfo == null)
- {
- resultModel.Message = "鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�!";
- return resultModel;
- }
//搴撳瓨鏄庣粏
var sd2 = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
if (sd2 == null)
@@ -452,10 +445,10 @@
sd2.InspectQty = 0;
sd2.ASNNo = "";
sd2.ASNDetailNo = null;
- sd2.WareHouseNo = endLocatInfo.WareHouseNo;//鎵�灞炰粨搴�
- sd2.RoadwayNo = endLocatInfo.RoadwayNo;//鎵�灞炲贩閬�
- sd2.AreaNo = endLocatInfo.AreaNo;//鎵�灞炲尯鍩�
- sd2.LocatNo = endLocatInfo.LocatNo;//鍌ㄤ綅鍦板潃
+ sd2.WareHouseNo = "";//鎵�灞炰粨搴�
+ sd2.RoadwayNo = "";//鎵�灞炲贩閬�
+ sd2.AreaNo = "";//鎵�灞炲尯鍩�
+ sd2.LocatNo = "";//鍌ㄤ綅鍦板潃
sd2.CompleteTime = comTime;
//淇敼搴撳瓨鏄庣粏
Db.Updateable(sd2).ExecuteCommand();
@@ -463,10 +456,6 @@
startLocatInfo.Status = "0";//绌哄偍浣�
//淇敼璧峰鍌ㄤ綅鐘舵��
Db.Updateable(startLocatInfo).ExecuteCommand();
-
- endLocatInfo.Status = "1";//鏈夌墿鍝�
- //淇敼鐩爣鍌ㄤ綅鐘舵��
- Db.Updateable(endLocatInfo).ExecuteCommand();
break;
#endregion
@@ -512,6 +501,10 @@
else if (endLocatInfo2.AreaNo == "A04")//鑴忔《鍖�
{
sd3.PalletStatus = "3";
+ sd3.LotNo = "";//鎵规
+ sd3.SkuNo = "";
+ sd3.SkuName = "";
+ sd3.InspectStatus = "0";//寰呮楠�
}
}
if (taskInfo.Type == "1")//鍑哄簱浠诲姟
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index e67646d..e602b17 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -566,7 +566,7 @@
throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
}*/
- SoResInfo result = _exNoticeSvc.ErpAddExportNotice(model);
+ SoResInfo result = _noticeSvc.CreateSoWork(model);
return Ok(result);
}
--
Gitblit v1.8.0