From 7db50f18acadde553410482937bb60b7663211ba Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 19 二月 2024 13:51:08 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 14 ++++++-
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 28 ++++++++++++--
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 23 +++++++++--
3 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index c3f0575..c6e0191 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -116,7 +116,15 @@
</script>
<script type="text/html" id="table-content-list">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- </script>
+ </script>
+ <script type="text/html" id="table-content-Packlist">
+ {{#
+ function GetPack(d){
+ return d.PackagNo + '-' + d.PackagName;
+ }
+ }}
+ {{ GetPack(d) }}
+ </script>
</div>
</div>
</div>
@@ -161,7 +169,7 @@
{field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 70},
{field: 'Standard',title: '瑙勬牸',width: 160,align: 'center'},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',edit: 'text',width: 160},
- {field: 'PackagNo',title: '鍖呰鍚嶇О',width: 160},
+ {field: 'PackagNo',title: '鍖呰鍚嶇О',width: 160, templet: "#table-content-Packlist"},
{field: 'Price',title: '鍗曚环',align: 'center',width: 80},
{field: 'Money',title: '閲戦',align: 'center',width: 100},
{field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',edit: 'text',width: 140},
@@ -681,12 +689,14 @@
}
arr.push(data[i]); //灞炴��
}
+
$.extend(infoOptions, {
data: arr
});
infoOptions.page = {
curr: 1
}
+ console.log(infoOptions)
table.render(infoOptions);
}
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 5045811..115195f 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -136,8 +136,8 @@
throw new Exception("鏈煡璇㈠埌鍏ュ簱鍗曟槑缁�");
}
- var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m=>m.Qty);
- var qty = detail.Qty-labelQty;
+ var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
+ var qty = detail.Qty - labelQty;
return qty.ToString();
}
@@ -501,6 +501,7 @@
}
+
// 鍒犻櫎鎬诲崟
sqlString = $"UPDATE BllArrivalNotice SET IsDel = '1',";
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
@@ -510,10 +511,28 @@
sqlString += $"UPDATE BllArrivalNoticeDetail SET IsDel = '1',";
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
+
+ //鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹�
+ // 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ if (model.Type == "1")
+ {
+ //鑾峰彇鍗曟嵁鐢熸垚瀵瑰簲鏍囩
+ var list = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.Status == "0" && a.BindNo == null);
+
+ //楠岃瘉瀵瑰簲绠辨敮淇℃伅鏄惁瀛樺湪
+ if (list == null)
+ {
+ return "-1:宸叉湁绠辩爜宸茬粦瀹氭墭鐩樻垨宸插叆搴擄紝涓嶅彲鍒犻櫎!";
+ }
+
+ // 鍒犻櫎瀵瑰簲绠辨敮淇℃伅
+ sqlString += $"UPDATE BllBoxInfo SET IsDel = '1',";
+ sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
+ sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
+ }
Db.Ado.BeginTran();
int rowCount = Db.Ado.ExecuteCommand(sqlString);
-
- if (rowCount < 2)
+ if (rowCount < 3)
{
Db.RollbackTran();
return "-1:鍒犻櫎澶辫触锛�";
@@ -524,6 +543,7 @@
}
catch (Exception ex)
{
+ Db.RollbackTran();
throw ex;
}
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index e64f8f5..37514c7 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1711,9 +1711,24 @@
string[] LotNoList = item.LotNo.Split(';');
foreach (var item2 in LotNoList)
{
- ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto();
- entry = item;
- entry.LotNo = item2;
+ ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto()
+ {
+ Id = item.Id,
+ ASNNo = item.ASNNo,
+ CompleteQty = item.CompleteQty,
+ CompleteTime = item.CompleteTime,
+ CreateTime = item.CreateTime,
+ Qty = item.Qty,
+ FactQty = item.FactQty,
+ LotNo = item2,
+ Money = item.Money,
+ PackagNo = item.PackagNo,
+ PackagName = item.PackagName,
+ Status = item.Status,
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ };
+
noticeList.Add(entry);
}
@@ -2079,7 +2094,7 @@
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
}
}
-
+
#endregion
#region 鍦扮爜淇℃伅(鍌ㄤ綅淇℃伅)
--
Gitblit v1.8.0