From ce528a91a0f42101c32b83cb3914eec69d5f8ad6 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 10:37:08 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 63 ++++++++++++++++++++++++++++++-
Pda/View/AsnSetting/productEnterQuantity .html | 0
Wms/Model/ModelDto/SysDto/CustomerDto.cs | 2
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 10 ++++
4 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 11938fc..7d53f60 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -62,7 +62,7 @@
</select>
</div>
- <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">瀹㈡埛鍚嶇О</p></label>
<div class="layui-input-inline">
<select name="CustomerName" id="CustomerName" lay-verify="" lay-search>
<option value=""></option>
@@ -143,6 +143,10 @@
});
var arr = [];
var TypeValue=$("#Type").val();
+
+ var type0 = [3]; //瀹㈡埛
+ var type1 = [1,5]; //渚涘簲鍟�
+ var type2 = [0,2,4,6]; //璐т富
// 鍔犺浇涓嬫媺淇℃伅
getCustomerList();
@@ -463,6 +467,7 @@
var value = data.value;
if(value!=TypeValue){
console.log(value);
+ getCustomerList();
arr = [];
// 娓叉煋Table
refreshTable(null);
@@ -584,13 +589,65 @@
// 缁戝畾涓嬫媺淇℃伅
function getCustomerList() {
+ /*
+ 0锛氬鎴�
+ 閫�璐у叆搴�
+ 3
+ 1锛氫緵搴斿晢
+ 閲囪喘鍏ュ簱銆佸叾瀹冨叆搴�
+ 1銆�5
+ 2锛氳揣涓�
+ 鎴愬搧鍏ュ簱銆佷腑闂村搧鍏ュ簱銆佽溅闂翠綑鏂欏叆搴撱�佷唬鍌ㄥ叆搴�
+ 0銆�2銆�4銆�6
+ */
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
- $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
- res.data[i].CustomerName + '</option>');
+ //鍒ゆ柇鍗曟嵁绫诲瀷
+ if (type0[0] == $("#Type").val())
+ {
+ /*
+ 0锛氬鎴�
+ 閫�璐у叆搴�
+ 3
+ */
+ if (res.data[i].Type == 0)
+ {
+ $("#CustomerNamep").html("瀹㈡埛閫夋嫨");
+ $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ else if (type1[0] == $("#Type").val() || type1[1] == $("#Type").val())
+ {
+ /*
+ 1锛氫緵搴斿晢
+ 閲囪喘鍏ュ簱銆佸叾瀹冨叆搴�
+ 1銆�5
+ */
+ if (res.data[i].Type == 1)
+ {
+ $("#CustomerNamep").html("渚涘簲鍟嗛�夋嫨");
+ $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ else if (type2[0] == $("#Type").val() || type2[1] == $("#Type").val() || type2[2] == $("#Type").val() || type2[3] == $("#Type").val())
+ {
+ /*
+ 2锛氳揣涓�
+ 鎴愬搧鍏ュ簱銆佷腑闂村搧鍏ュ簱銆佽溅闂翠綑鏂欏叆搴撱�佷唬鍌ㄥ叆搴�
+ 0銆�2銆�4銆�6
+ */
+ if (res.data[i].Type == 2)
+ {
+ $("#CustomerNamep").html("璐т富閫夋嫨");
+ $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
}
form.render('select');
} else { //涓嶆垚鍔�
diff --git a/Pda/View/AsnSetting/productEnter1.html b/Pda/View/AsnSetting/productEnterQuantity .html
similarity index 100%
rename from Pda/View/AsnSetting/productEnter1.html
rename to Pda/View/AsnSetting/productEnterQuantity .html
diff --git a/Wms/Model/ModelDto/SysDto/CustomerDto.cs b/Wms/Model/ModelDto/SysDto/CustomerDto.cs
index 52ea4a7..3277fae 100644
--- a/Wms/Model/ModelDto/SysDto/CustomerDto.cs
+++ b/Wms/Model/ModelDto/SysDto/CustomerDto.cs
@@ -18,7 +18,7 @@
public string CustomerName { get; set; }
/// <summary>
- /// 绫诲瀷 0 閿�鍞鎴�/璐т富 1 渚涜揣鍟�
+ /// 绫诲瀷 0 閿�鍞鎴� 1 渚涜揣鍟� 2锛氳揣涓�
/// </summary>
public int? Type { get; set; }
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index ea55e4a..3b76924 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1800,6 +1800,10 @@
IsBelt = "0",
CreateUser = userId
};
+ if (model.SkuQty > pNum)
+ {
+ throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+ }
// 鎻掑叆鎵樼洏缁戝畾琛�
bindId = Db.Insertable(bind).ExecuteReturnIdentity();
}
@@ -1893,6 +1897,10 @@
{
bind.BitPalletMark = "0";
}
+ if (bind.Qty > pNum)
+ {
+ throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+ }
Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
// 鏇存敼鍏ュ簱鍗曟槑缁嗗凡缁勬暟閲�
@@ -1922,7 +1930,7 @@
//娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
Db.Ado.ExecuteCommand(sqlStr);
- new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾1", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}銆亄msgStr}鐨勭粍鐩樹俊鎭�", userId);
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}銆亄msgStr}鐨勭粍鐩樹俊鎭�", userId);
Db.CommitTran();
}
--
Gitblit v1.8.0