From 94deafdd5a4fdd4a1717aead3ce542bfed5d62ea Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 26 八月 2024 09:13:05 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Pda/View/AsnSetting/pingKuEnter.html | 11 +++--
Pda/View/AsnSetting/productEnterQuantity.html | 3 +
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 4 +-
Wms/Wms/Controllers/BllCheckController.cs | 11 +----
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 50 +++++++++++++++++++++++--
HTML/views/WareHouseSetting/Locate.html | 2
6 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index e3fbe92..02f55f4 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -208,7 +208,7 @@
//鐩戝惉鎻愪氦
iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- console.log(field);
+ console.log("淇敼鐨勫瓧娈碉細"+field);
var msg = [];
for (var i = 0; i < checkData.length; i++) {
// msg.push(checkData[i].Id);
diff --git a/Pda/View/AsnSetting/pingKuEnter.html b/Pda/View/AsnSetting/pingKuEnter.html
index 5319e45..c1cd262 100644
--- a/Pda/View/AsnSetting/pingKuEnter.html
+++ b/Pda/View/AsnSetting/pingKuEnter.html
@@ -424,16 +424,17 @@
// //鍥炶皟
// });
// }
- let bval = $('select[id="bar"]').next().find('.layui-select-title input').val()
- if (!bval && IsHuiKu == 0) {
- layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
+
+ if (!$("#PalletNo").val()) {
+ layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
return;
}
- if (!$("#PalletNo").val()) {
- layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
+ let bval = $('select[id="bar"]').next().find('.layui-select-title input').val()
+ if (!bval && IsHuiKu == 0) {
+ layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 53fecbf..9b7e14c 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -854,6 +854,9 @@
$("#ImportQuantity").val("");
$("#Standard").val("");
$("#ImportFactQuantity").val("");
+ $("#BoxQty").val("");
+ $("#STOCKCODE").val("");
+ $("#BOXCODE").val("");
var param = {
Id: parseInt($("#goodSelect").val())
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 27ac2ea..bed4f60 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -5153,7 +5153,7 @@
SendDate = serverTime, //鍙戦�佹椂闂�
BackDate = serverTime, //杩斿洖鏃堕棿
StartLocat = "",//璧峰浣嶇疆
- EndLocat = "鍔涜骞冲簱",//鐩爣浣嶇疆
+ EndLocat = "骞冲簱",//鐩爣浣嶇疆
PalletNo = bindInfo.PalletNo,//鎵樼洏鐮�
IsSend = 0,//鏄惁鍙啀娆′笅鍙�
IsCancel = 0,//鏄惁鍙彇娑�
@@ -5161,7 +5161,7 @@
Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鍔涜骞冲簱鐨勫叆搴撲换鍔�",
+ Msg = "骞冲簱鐨勫叆搴撲换鍔�",
};
Db.Insertable(exTask).ExecuteCommand();
@@ -5175,6 +5175,27 @@
bindInfo.TaskNo = taskNo; //浠诲姟鍙�
Db.Updateable(bindInfo).ExecuteCommand();
#endregion
+
+ /* #region 娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = bindInfo.ASNNo,
+ PalletNo = bindInfo.PalletNo,
+ SkuNo = stockModel.SkuNo,
+ SkuName = stockModel.SkuName,
+ LotNo = stockModel.LotNo,
+ Status = "1",
+
+ WareHouseNo = bindInfo.WareHouseNo,
+ RoadwayNo = bindInfo.RoadwayNo,
+ AreaNo = "",
+ LocatNo = "",
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ #endregion*/
#region 搴撳瓨绠辨敮鏄庣粏琛�
// 鎻掑叆鏂扮粍鐨勭鏀俊鎭�
@@ -5271,7 +5292,7 @@
SendDate = DateTime.Now, //鍙戦�佹椂闂�
BackDate = DateTime.Now, //杩斿洖鏃堕棿
StartLocat = "",//璧峰浣嶇疆
- EndLocat = "鐗у師骞冲簱",//鐩爣浣嶇疆
+ EndLocat = "骞冲簱",//鐩爣浣嶇疆
PalletNo = model.PalletNo,//鎵樼洏鐮�
IsSend = 0,//鏄惁鍙啀娆′笅鍙�
IsCancel = 0,//鏄惁鍙彇娑�
@@ -5279,7 +5300,7 @@
Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鐗у師骞冲簱鐨勫叆搴撲换鍔�",
+ Msg = "骞冲簱鐨勫叆搴撲换鍔�",
};
Db.Insertable(exTask).ExecuteCommand();
//鎵樼洏缁戝畾淇℃伅
@@ -5295,6 +5316,27 @@
Db.Updateable(bindInfo).ExecuteCommand();
}
#endregion
+
+ #region 娣诲姞鎵樼洏涓婃灦璁板綍
+ var palletupinfo = stockDetail.First();
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = bindInfo.ASNNo,
+ PalletNo = bindInfo.PalletNo,
+ SkuNo = palletupinfo.SkuNo,
+ SkuName = palletupinfo.SkuName,
+ LotNo = palletupinfo.LotNo,
+ Status = "2",
+ LocatNo = model.LocatNo,
+ WareHouseNo = bindInfo.WareHouseNo,
+ RoadwayNo = bindInfo.RoadwayNo,
+ AreaNo = storageLocat.AreaNo,
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ #endregion
}
storageLocat.Status = "1";//鐘舵�佸凡浣跨敤
storageLocat.UpdateTime = serverTime; //淇敼鏃堕棿
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 5082e8a..ec36530 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -879,8 +879,8 @@
// "B14",
// "B15",
//};
- string row1 = "'B01','B02','B03','B04','B05','B06','B07'";
- string row3 = "'B11','B12','B13','B14','B15'";
+ string row1 = "'A06'";
+ string row3 = "'A08'";
string str = $"select * from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and ";
if (row == "1")
{
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 0954035..c3ea448 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -133,16 +133,9 @@
[UnitOfWork]
public async Task<IActionResult> DelStockCheck(IdVm model)
{
- try
- {
- await _stockCheckSvc.DelStockCheck(model.Id);
+ await _stockCheckSvc.DelStockCheck(model.Id);
- return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曞垹闄ゆ垚鍔�" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" + e.Message });
- }
+ return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曞垹闄ゆ垚鍔�" });
}
/// <summary>
--
Gitblit v1.8.0