From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Pda/View/SoSetting/productOut.html | 6 +-
Wms/WMS.BLL/SysServer/ExceptionServer.cs | 3 +
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 22 +++++++---
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 7 +++
HTML/views/SOSetting/ExportHandOutList.html | 2
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 4 +-
Wms/Model/InterFaceModel/AsnModels.cs | 1
Wms/Wms/Controllers/DownApiController.cs | 26 +++++++++++++
8 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/HTML/views/SOSetting/ExportHandOutList.html b/HTML/views/SOSetting/ExportHandOutList.html
index 73ace4e..5a5ba5f 100644
--- a/HTML/views/SOSetting/ExportHandOutList.html
+++ b/HTML/views/SOSetting/ExportHandOutList.html
@@ -392,7 +392,7 @@
}
var item = {
StockId: parseInt(infoOptions.data[i].Id),
- Qty: parseInt(infoOptions.data[i].ExportQty)
+ Qty: parseFloat(infoOptions.data[i].ExportQty)
};
DataList.push(item);
}
diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index b538ac9..4e781fd 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -975,7 +975,7 @@
});
return;
}
- if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseInt($('#pickQty').val())){
+ if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseFloat($('#pickQty').val())){
layer.msg("鎷ｈ揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1473,8 +1473,8 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
- let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseFloat($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
if (pickQty <= 0) {
layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
icon: 2,
diff --git a/Wms/Model/InterFaceModel/AsnModels.cs b/Wms/Model/InterFaceModel/AsnModels.cs
index 4f14cec..eed1ad3 100644
--- a/Wms/Model/InterFaceModel/AsnModels.cs
+++ b/Wms/Model/InterFaceModel/AsnModels.cs
@@ -105,6 +105,7 @@
public class BoxInfoCheck
{
+ public string BoxNo { get; set; }
public string PalletNo { get; set; }
public string TaskNo { get; set; }
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 517de10..52a0b07 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -399,8 +399,8 @@
{
throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
}
- var type1 = new List<string>() { "0", "4" }; //鎷ｈ揣涓嶅彲澶氬嚭
- var type2 = new List<string>() { "1", "2", "3", "5", "6", "7", "8" };//鎷ｈ揣鍙鍑�
+ var type1 = new List<string>() { "0", "4" }; //鎷ｈ揣涓嶅彲澶氬嚭 鎴愬搧鍑哄簱銆佷笉鍚堟牸鍝佸嚭搴�
+ var type2 = new List<string>() { "1", "2", "3", "5", "6", "7", "8" };//鎷ｈ揣鍙鍑� 棰嗘枡鍑哄簱銆佹娊妫�鍑哄簱銆佺墿鏂欏彇鏍峰嚭搴撱�佷腑闂村搧鍑哄簱銆佷唬鍌ㄥ嚭搴撱�佸叾浠栧嚭搴撱�佸瘎瀛樺嚭搴�
if (type1.Contains(notice.Type))
{
if (notice.Status != "3")
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 5c6687e..07842f2 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2923,7 +2923,15 @@
// 鍑哄簱鎬昏〃 鐘舵�佹敼涓洪儴鍒嗗垎閰�
var noticeModel = Db.Queryable<BllExportNotice>().First(m => m.SONo == noticeDetailModel.SONo && m.IsDel == "0");
- noticeModel.Status = "1";
+ if (noticeDetailModel.AllotQty<=0)
+ {
+ noticeModel.Status = "0";
+ }
+ else
+ {
+ noticeModel.Status = "1";
+ }
+
Db.Updateable(noticeModel).ExecuteCommand();
// 搴撳瓨鏄庣粏琛� 鐘舵�佷慨鏀逛负寮傚父閿佸畾 閿佸畾鏁伴噺淇敼涓烘墭鐩樹笂鏁伴噺
@@ -2937,7 +2945,7 @@
// 搴撳瓨鎬昏〃 閿佸畾鏁伴噺=褰撳墠閿佸畾鏁伴噺 + (搴撳瓨鏄庣粏鎵樼洏涓婃暟閲�-搴撳瓨鏄庣粏鎵樼洏涓婂凡閿佸畾鐨勬暟閲�)
var stockModel = Db.Queryable<DataStock>().First(m => m.LotNo == stockDetailModel.LotNo && m.SkuNo == stockDetailModel.SkuNo && m.IsDel == "0");
- stockModel.LockQty = stockModel.LockQty + (int)(stockDetailModel.Qty - lockQty);
+ stockModel.LockQty = stockModel.LockQty + (decimal)(stockDetailModel.Qty - lockQty);
Db.Updateable(stockModel).ExecuteCommand();
// 鎷ｈ揣鏄庣粏琛� 鍒犻櫎
@@ -3622,7 +3630,7 @@
foreach (var item in detailList)
{
totalQty += item.Qty;
- totalAllotQty += Convert.ToInt32(item.AllotQty);
+ totalAllotQty += Convert.ToDecimal(item.AllotQty);
}
if (totalAllotQty >= totalQty)
@@ -3845,10 +3853,10 @@
}
/// <summary>
- /// 鑾峰彇鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
+ /// 鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
/// </summary>
- /// <param name="model">鎷嗗灈鎵樼洏鍙峰拰WCS浠诲姟鍙�</param>
- /// <returns>鎷嗗灈鎵樼洏淇℃伅</returns>
+ /// <param name="model">绠卞彿</param>
+ /// <returns>鍑哄簱鍒嗘嫞鍙�</returns>
public string BoxInfoExportWcs(string boxno)
{
try
@@ -4031,7 +4039,7 @@
//淇敼鍑哄簱鍗曚俊鎭�
Db.Updateable(notice).ExecuteCommand();
- return "";
+ return allot.LoadingAddre;
}
catch (Exception e)
{
diff --git a/Wms/WMS.BLL/SysServer/ExceptionServer.cs b/Wms/WMS.BLL/SysServer/ExceptionServer.cs
index 901b136..fab78c7 100644
--- a/Wms/WMS.BLL/SysServer/ExceptionServer.cs
+++ b/Wms/WMS.BLL/SysServer/ExceptionServer.cs
@@ -228,6 +228,7 @@
{
//鍌ㄤ綅琛�, 灏嗗偍浣嶆爣蹇桭lag淇敼涓猴細0锛氭甯�
storageLocat.Flag = "0";
+ storageLocat.Status = "1";
storageLocat.UpdateUser = tabledto.UpdateUser;
storageLocat.UpdateTime = time;
@@ -240,7 +241,7 @@
Db.Updateable(stockDetail).UpdateColumns(it => new { it.LockQty, it.Status, it.UpdateUser, it.UpdateTime }).ExecuteCommand();
//搴撳瓨鎬昏〃锛屼慨鏀归攣瀹氭暟閲廘ockQty=閿佸畾鏁伴噺-鎵樼洏鏁伴噺
- stock.LockQty = Convert.ToInt32(stock.LockQty - stockDetail.Qty);
+ stock.LockQty = Convert.ToDecimal(stock.LockQty - stockDetail.Qty);
stock.UpdateUser = tabledto.UpdateUser;
stock.UpdateTime = time;
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index e6f2d61..59d9535 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -223,5 +223,12 @@
/// <returns>鎷嗗灈鎵樼洏淇℃伅</returns>
public RequestBoxInfoCheck BoxInfoCheckWcs(BoxInfoCheck model);
+
+ /// <summary>
+ /// 鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
+ /// </summary>
+ /// <param name="boxno"></param>
+ /// <returns></returns>
+ string BoxInfoExportWcs(string boxno);
}
}
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 198bcc5..8b596bf 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -724,6 +724,32 @@
}
+
+ /// <summary>
+ /// 鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult ResultBoxInfoExportWcs(BoxInfoCheck model)
+ {
+ var logStr = $@".\log\WCS\WCS鐢宠鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣淇℃伅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ //杩斿洖鍑哄簱鍒嗘嫞瑁呰溅鍙�
+ var list = _exNoticeSvc.BoxInfoExportWcs(model.BoxNo);
+ return Ok(new { Success = 1, Message = "鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣鎴愬姛", loadubgAddre = list });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+
+ }
+
#region AGV
--
Gitblit v1.8.0