From 719ef250e88b8628ba5cbaeb4973b7c693e01694 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 11:41:21 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 63 ++++++++++++++++++++++++++++++-
HTML/views/WareHouseSetting/StorageLegend.html | 6 +-
HTML/views/WareHouseSetting/Roadway.html | 2
Pda/View/AsnSetting/productEnterQuantity .html | 0
HTML/views/WareHouseSetting/LocateFrom.html | 6 +-
Wms/Model/ModelDto/SysDto/CustomerDto.cs | 2
Wms/Model/ModelDto/SysDto/RoadwayDto.cs | 8 ++++
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 2
HTML/views/WareHouseSetting/Area.html | 2
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 10 ++++
HTML/views/WareHouseSetting/Locate.html | 6 +-
11 files changed, 90 insertions(+), 17 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/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 98ff937..a177cb2 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -112,7 +112,7 @@
sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 43ad11c..efde3f6 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -446,7 +446,7 @@
sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
form.render('select');
@@ -470,7 +470,7 @@
$("#RoadwayNo").append('<option value =""></option>');
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
res.data[i].RoadwayName + '</option>');
}
form.render('select');
@@ -490,7 +490,7 @@
$("#AreaNo").append('<option value =""></option>');
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' +
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].AreaName + '</option>');
}
form.render('select');
diff --git a/HTML/views/WareHouseSetting/LocateFrom.html b/HTML/views/WareHouseSetting/LocateFrom.html
index e067a84..e03bdf9 100644
--- a/HTML/views/WareHouseSetting/LocateFrom.html
+++ b/HTML/views/WareHouseSetting/LocateFrom.html
@@ -182,7 +182,7 @@
if (res.code == 0) { //鎴愬姛
$("#RoadwayNo").empty();
for (var i = 0; i < res.data.length; i++) {
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
$("select[name='WareHouseNo']").val(val);
@@ -202,7 +202,7 @@
if (res.code == 0) { //鎴愬姛
$("#AreaNo").empty();
for (var i = 0; i < res.data.length; i++) {
- $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' +
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
res.data[i].AreaName + '</option>');
}
$("select[name='AreaNo']").val(val);
@@ -225,7 +225,7 @@
if (res.code == 0) { //鎴愬姛
$("#RoadwayNo").empty();
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
res.data[i].RoadwayName + '</option>');
}
$("select[name='RoadwayNo']").val(val);
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index c7ac06c..afa6f04 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -115,7 +115,7 @@
for (var i = 0; i < res.data.length; i++) {
if (res.data[i].WareHouseNo == 'W01')
{
- $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' +
+ $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index c58250d..22313ca 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -235,7 +235,7 @@
continue;
}
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
$("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
@@ -398,11 +398,11 @@
function getRoadway() {
$("#RoadwayNo").empty();
synData(IP + "/Sys/GetRoadwayList", { WareHouseNo: $("#WareHouseNo").val() }, 'get', function (res) {
- //console.log(res)
+ // console.log(res)
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
res.data[i].RoadwayName + '</option>');
}
$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
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/Model/ModelDto/SysDto/RoadwayDto.cs b/Wms/Model/ModelDto/SysDto/RoadwayDto.cs
index b424a6f..8e1da8f 100644
--- a/Wms/Model/ModelDto/SysDto/RoadwayDto.cs
+++ b/Wms/Model/ModelDto/SysDto/RoadwayDto.cs
@@ -19,6 +19,14 @@
/// Nullable:False
/// </summary>
public string RoadwayName { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炰粨搴撳彿
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string WareHouseNo { get; set; }
+
/// <summary>
/// 鎵�灞炰粨搴撳悕绉�
/// Default:
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();
}
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 46abd4e..302db35 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -631,7 +631,7 @@
{
try
{
- string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
+ string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
{
--
Gitblit v1.8.0