From f10e29b77659f6b7db1cf8d0e0fc5387b958e2c5 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 17 七月 2024 16:54:08 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Model/InterFaceModel/SoModel.cs | 7 +++
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 8 +++-
Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs | 1
HTML/views/SOSetting/ExportNotice.html | 70 +++++++++++++++++++++++------------
Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs | 8 +++
Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs | 5 ++
6 files changed, 72 insertions(+), 27 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 0568bea..ffa8410 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -324,6 +324,21 @@
}}
{{ GetBtn9(d) }}
</script>
+
+ <script type="text/html" id="templetIsMixBox">
+ {{# function GetBtn10(d){
+ switch (d.IsMixBox) {
+ case "0":
+ return "鍚�";
+ case "1":
+ return "鏄�";
+ default:
+ return "";
+ }
+ }
+ }}
+ {{ GetBtn10(d) }}
+ </script>
<!-- #endregion -->
</div>
@@ -770,6 +785,7 @@
{ field: 'CompleteQty', title: '鎷ｈ揣鏁伴噺', align: 'center', width: 100 },
{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
{ field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
+ { field: 'IsMixBox', title: '鏄惁鎷肩', align: 'center', templet: '#templetIsMixBox', width: 90 },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100 },
{ field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 120 },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 120 },
@@ -1181,31 +1197,37 @@
isChongFu = true;
});
} else { //涓嶆垚鍔�
-
- layer.confirm('褰撳墠鍗曟嵁鎵规鍑哄簱鏄法鎵瑰嚭搴擄紝鏄惁璺ㄦ壒鍑哄簱锛�', function () {
- var param1 = {
- soNo: SoNo,
- tab: "1"
- };
- sendData(IP + "/BllSo/ExportAutoAllot", param1, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg("鎿嶄綔鎴愬姛锛�", {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- isChongFu = true;
- });
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- isChongFu = true;
- });
- }
+ if(res.code==2){
+ layer.confirm('褰撳墠鍗曟嵁鎵规鍑哄簱鏄法鎵瑰嚭搴擄紝鏄惁璺ㄦ壒鍑哄簱锛�', function () {
+ var param1 = {
+ soNo: SoNo,
+ tab: "1"
+ };
+ sendData(IP + "/BllSo/ExportAutoAllot", param1, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg("鎿嶄綔鎴愬姛锛�", {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ isChongFu = true;
+ });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ isChongFu = true;
+ });
+ }
+ })
})
- })
+ }else{
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
isChongFu = true;
}
});
diff --git a/Wms/Model/InterFaceModel/SoModel.cs b/Wms/Model/InterFaceModel/SoModel.cs
index c48ca16..b9bf606 100644
--- a/Wms/Model/InterFaceModel/SoModel.cs
+++ b/Wms/Model/InterFaceModel/SoModel.cs
@@ -67,6 +67,13 @@
/// 涓婃父绯荤粺鏄庣粏鍗曞彿
/// </summary>
public string OrderDetailCode { get; set; }
+
+ /// <summary>
+ /// Desc:鏄惁鎺ュ彈鎷肩
+ /// Default: 0锛氬惁 1锛氭槸
+ /// Nullable:True
+ /// </summary>
+ public string IsMixBox { get; set; }
}
/// <summary>
diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
index 4ef74ba..05405f8 100644
--- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
+++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
@@ -96,6 +96,11 @@
public string IsBelt { get; set; }
/// <summary>
+ /// 鏄惁鎺ュ彈鎷肩
+ /// </summary>
+ public string IsMixBox { get; set; }
+
+ /// <summary>
/// Desc:渚涜揣鎵规
/// </summary>
public string SupplierLot { get; set; }
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
index 4ed4983..3cc19b6 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
@@ -64,6 +64,7 @@
SupplierLot = a.SupplierLot,
IsWave = a.IsWave,
WaveNo = a.WaveNo,
+ IsMixBox = a.IsMixBox,
CreateUserName = c.RealName,
UpdateUserName = d.RealName,
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 154a06f..e746979 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -430,6 +430,7 @@
IsWave = "0",
WaveNo = "",
IsIssueLotNo = string.IsNullOrWhiteSpace(d.LotNo) ? "0" : "1",
+ IsMixBox = d.IsMixBox,
OrderDetailCode = d.OrderDetailCode,
@@ -540,7 +541,7 @@
var item = new BllExportNoticeDetail()
{
SONo = billNo,
- OrderDetailCode=d.OrderDetailCode,
+ OrderDetailCode = d.OrderDetailCode,
SkuNo = sku.SkuNo,
SkuName = sku.SkuName,
Standard = sku.Standard,
@@ -559,6 +560,7 @@
IsWave = "0",
WaveNo = "",
IsIssueLotNo = string.IsNullOrWhiteSpace(d.LotNo) ? "0" : "1",
+ IsMixBox = d.IsMixBox,
CreateUser = 0,
};
@@ -4307,6 +4309,8 @@
var noticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == soNo).ToList();
//搴撳瓨鎬昏〃淇℃伅
var data = Db.Queryable<DataStock>().Where(m => m.IsDel == "0").ToList();
+ //搴撳瓨鏄庣粏涓楠屽悎鏍兼壒娆￠泦鍚�
+ var dataDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.InspectStatus == "1").GroupBy(g => g.LotNo).Select(s => s.LotNo).ToList();
//搴撳瓨鏄庣粏琛ㄤ俊鎭�
var dataBoxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0").ToList();
@@ -4316,7 +4320,7 @@
{
//楠岃瘉鍏堣繘鍏堝嚭鍘熷垯
- var forData = data.Where(m => m.SkuNo == item.SkuNo && m.LotNo != item.LotNo && (m.Qty - m.FrozenQty - m.LockQty) > 0 ).Select(m=>m.LotNo).ToList(); //鑾峰彇褰撳墠鐗╂枡鐨勬墍鏈夋壒娆′俊鎭�(鎺掗櫎鍗曟嵁鐨勬壒娆★紝闃叉鍗曟嵁鎵�鍦ㄦ壒娆￠攣瀹氭暟閲忓悗楠岃瘉灏忎簬绛変簬0)
+ var forData = data.Where(m => m.SkuNo == item.SkuNo && m.LotNo != item.LotNo && (m.Qty - m.FrozenQty - m.LockQty) > 0 && dataDetail.Contains(m.LotNo)).Select(m=>m.LotNo).ToList(); //鑾峰彇褰撳墠鐗╂枡鐨勬墍鏈夋壒娆′俊鎭�(鎺掗櫎鍗曟嵁鐨勬壒娆★紝闃叉鍗曟嵁鎵�鍦ㄦ壒娆￠攣瀹氭暟閲忓悗楠岃瘉灏忎簬绛変簬0)
forData.Add(item.LotNo); //闆嗗悎娣诲姞鍗曟嵁鐨勬壒娆�
//鑾峰彇鎺掑簭鍚庣殑绗竴涓壒娆�
diff --git a/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs b/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs
index c7580de..f1094de 100644
--- a/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs
@@ -153,7 +153,13 @@
/// Nullable:True
/// </summary>
public string IsIssueLotNo { get; set; }
-
+
+ /// <summary>
+ /// Desc:鏄惁鎺ュ彈鎷肩
+ /// Default: 0锛氬惁 1锛氭槸
+ /// Nullable:True
+ /// </summary>
+ public string IsMixBox { get; set; }
/// <summary>
/// 鑷畾涔夊垪1
--
Gitblit v1.8.0