From 009e869b09a63efbc5e58e22f88ad0ed2a315e2b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 16:12:16 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 81 +++++++++++++++++---------
Pda/View/AsnSetting/productEnterQuantity.html | 11 ++-
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 59 ++++++++++---------
Wms/Wms/Controllers/BllAsnController.cs | 2
HTML/views/ASNSetting/ArrivalNotice.html | 3 +
5 files changed, 96 insertions(+), 60 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 938ca98..3c4ae48 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -100,6 +100,7 @@
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
+ <option value="7">瀵勫瓨鍏ュ簱</option>
<!-- JC09 -->
<!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
<option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
@@ -241,6 +242,8 @@
html = `鍏跺畠鍏ュ簱`;
}else if(d.Type=='6') {
html = `浠ｅ偍鍏ュ簱`;
+ }else if(d.Type=='7') {
+ html = `瀵勫瓨鍏ュ簱`;
}else {
}
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 7d53f60..ea64c3a 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -55,6 +55,7 @@
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
+ <option value="7">瀵勫瓨鍏ュ簱</option>
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
@@ -143,10 +144,6 @@
});
var arr = [];
var TypeValue=$("#Type").val();
-
- var type0 = [3]; //瀹㈡埛
- var type1 = [1,5]; //渚涘簲鍟�
- var type2 = [0,2,4,6]; //璐т富
// 鍔犺浇涓嬫媺淇℃伅
getCustomerList();
@@ -605,14 +602,31 @@
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
- //鍒ゆ柇鍗曟嵁绫诲瀷
- if (type0[0] == $("#Type").val())
+ var TypeNum = 0;
+
+ switch($("#Type").val())
{
- /*
- 0锛氬鎴�
- 閫�璐у叆搴�
- 3
- */
+ case "3": //閫�璐у叆搴�
+ TypeNum = 0;
+ console.log(TypeNum)
+ break;
+ case "1": //閲囪喘鍏ュ簱
+ case "5": //鍏跺畠鍏ュ簱
+ TypeNum = 1;
+ console.log(TypeNum)
+ break;
+ case "0": //鎴愬搧鍏ュ簱
+ case "2": //涓棿鍝佸叆搴�
+ case "4": //杞﹂棿浣欐枡鍏ュ簱
+ case "6": //浠ｅ偍鍏ュ簱
+ case "7": //瀵勫瓨鍏ュ簱
+ TypeNum = 2;
+ console.log(TypeNum)
+ break;
+ }
+ //鍒ゆ柇鍗曟嵁绫诲瀷
+ if (TypeNum == 0)
+ {
if (res.data[i].Type == 0)
{
$("#CustomerNamep").html("瀹㈡埛閫夋嫨");
@@ -620,13 +634,8 @@
res.data[i].CustomerName + '</option>');
}
}
- else if (type1[0] == $("#Type").val() || type1[1] == $("#Type").val())
+ else if (TypeNum == 1)
{
- /*
- 1锛氫緵搴斿晢
- 閲囪喘鍏ュ簱銆佸叾瀹冨叆搴�
- 1銆�5
- */
if (res.data[i].Type == 1)
{
$("#CustomerNamep").html("渚涘簲鍟嗛�夋嫨");
@@ -634,13 +643,8 @@
res.data[i].CustomerName + '</option>');
}
}
- else if (type2[0] == $("#Type").val() || type2[1] == $("#Type").val() || type2[2] == $("#Type").val() || type2[3] == $("#Type").val())
+ else if (TypeNum == 2)
{
- /*
- 2锛氳揣涓�
- 鎴愬搧鍏ュ簱銆佷腑闂村搧鍏ュ簱銆佽溅闂翠綑鏂欏叆搴撱�佷唬鍌ㄥ叆搴�
- 0銆�2銆�4銆�6
- */
if (res.data[i].Type == 2)
{
$("#CustomerNamep").html("璐т富閫夋嫨");
@@ -762,11 +766,32 @@
return -1;
}
if (arr[i].LotNo == "" || arr[i].LotNo ==undefined) {
- layer.msg("璇疯緭鍏ユ壒娆★紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return -1;
+ //鍒ゆ柇鏄惁涓哄搴斾笉闇�瑕佹壒娆＄殑鍗曟嵁
+ var TypeNum = 0;
+
+ switch($("#Type").val())
+ {
+ //1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ case "1" :
+ case "2" :
+ case "5" :
+ case "6" :
+ case "7" :
+ console.log($("#Type").val())
+ TypeNum = 1;
+ break;
+ }
+ console.log(TypeNum)
+
+ if (TypeNum == 0)
+ {
+ layer.msg("璇疯緭鍏ユ壒娆★紒1", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
+
}
if (!reg.test(arr[i].Qty)) {
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 43c99f9..da587ad 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -598,7 +598,7 @@
form.render('select');
var param = {
- Type: "2,5,6"
+ Type: "2,5,6,7"
};
sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -923,11 +923,14 @@
for (var i = 0; i < res.data.length; i++) {
if (i == 0) {
$("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
- '</option>');
+ .SkuName);
} else {
$("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName);
+ }
+ if (res.data[i].LotNo != null)
+ {
+ $("#goodSelect1").append("-" + res.data[i].LotNo +
'</option>');
}
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index ebbd1ce..5045811 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -153,28 +153,26 @@
try
{
string skuType = string.Empty;
- switch(model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
+ switch (model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
{
case "0"://鎴愬搧鍏ュ簱
+ case "3"://閫�璐у叆搴�
+ case "5"://鍏跺畠鍏ュ簱
+ case "6"://浠ｅ偍鍏ュ簱
skuType = "(2)";
break;
case "1"://閲囪喘鍏ュ簱
+ case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
skuType = "(0,1,3)";
break;
case "2"://涓棿鍝佸叆搴�
skuType = "(4)";
break;
- case "3"://閫�璐у叆搴�
- skuType = "(2)";
+ case "7"://瀵勫瓨鍏ュ簱
+ skuType = "(0,1,2,3,4)";
break;
- case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
- skuType = "(0,1,3)";
- break;
- case "5"://鍏跺畠鍏ュ簱
- skuType = "(2)";
- break;
- case "6"://浠ｅ偍鍏ュ簱
- skuType = "(2)";
+ default: //鍏跺畠
+ skuType = "(0,1,2,3,4)";
break;
}
@@ -231,6 +229,9 @@
string strMessage = "";
string sqlString = string.Empty;
string sqlDetailStr = string.Empty;
+ //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ var TypeLot = "1, 2, 5, 6, 7";
+
try
{
if (model.Origin == "褰曞叆")
@@ -274,8 +275,12 @@
}
if (string.IsNullOrEmpty(detailModel.LotNo))
{
- strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
- continue;
+ //鍒ゆ柇鏄惁涓轰笉闄愬埗鎵规鍗曟嵁
+ if (!TypeLot.Contains(model.Type))
+ {
+ strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
+ continue;
+ }
}
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ綋鍓嶆槑缁�
string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
@@ -353,7 +358,7 @@
sqlString = "UPDATE BllArrivalNotice SET ";
sqlString += $"CustomerNo = '{model.CustomerNo}',CustomerName = '{model.CustomerName}',";
- sqlString += $"LotNo = '{model.LotNo}',LotText = '{model.LotText}',";
+ sqlString += $"LotNo = '{model.LotNo}',LotText = '{model.LotText}',";
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
sqlString += $"WHERE ASNNo = '{model.ASNNo}'";
@@ -626,7 +631,7 @@
}
}
//鍏ュ簱鍗曟挙閿�鐢宠
- public void CancelOrder(int id,string reason,int userId)
+ public void CancelOrder(int id, string reason, int userId)
{
try
{
@@ -635,29 +640,29 @@
{
throw new Exception("鏈煡璇㈠埌鍏ュ簱鍗曟嵁淇℃伅");
}
- if (notice.Status!="1" && notice.Status != "2")
+ if (notice.Status != "1" && notice.Status != "2")
{
throw new Exception("鍏ュ簱鍗曟嵁鐘舵�佷笉鏄鍦ㄦ墽琛屾垨鎵ц瀹屾垚锛屼笉鑳芥挙閿�");
}
var bind = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo).ToList();
- if (bind.Count==0)
+ if (bind.Count == 0)
{
throw new Exception("鏈煡璇㈠埌鍏ュ簱鍗曟嵁鐨勬墭鐩樼粦瀹氫俊鎭�");
}
- if (bind.Count(m=>m.Status== "1")>0)
+ if (bind.Count(m => m.Status == "1") > 0)
{
throw new Exception("褰撳墠鍏ュ簱鍗曟嵁鐨勬墭鐩樼粦瀹氫俊鎭湁姝ｅ湪鎵ц鐨勶紝璇风◢鍚庡畬鎴愬悗鍐嶆挙閿�");
}
var auditLog = Db.Queryable<BllAuditLog>().Where(m => m.IsDel == "0" && m.Status == "0");
var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo);
- if (auditLog.Count(m=>m.OrderNo == notice.ASNNo)>0)
+ if (auditLog.Count(m => m.OrderNo == notice.ASNNo) > 0)
{
throw new Exception("褰撳墠鍏ュ簱鍗曟嵁宸叉湁鎾ら攢瀹℃牳锛岃绛夊緟瀹℃牳瀹屾垚");
}
-
+
var startStatusName = "";
var endStatusName = "";
@@ -672,7 +677,7 @@
endStatusName = "姝ｅ湪鎵ц";
break;
default:
- throw new Exception("鍗曟嵁鐘舵�侀敊璇�");
+ throw new Exception("鍗曟嵁鐘舵�侀敊璇�");
}
var palletStr = "";
@@ -680,16 +685,16 @@
var msgL = "";
foreach (var item in bind)
{
- if (auditLog.Count(m=>m.OrderNo ==item.ASNNo && m.PalletNo.Contains(item.PalletNo)) >0)
+ if (auditLog.Count(m => m.OrderNo == item.ASNNo && m.PalletNo.Contains(item.PalletNo)) > 0)
{
continue;
}
if (!palletStr.Contains(item.PalletNo))
{
- palletStr += item.PalletNo+";";
+ palletStr += item.PalletNo + ";";
}
-
+
var info = boxInfo.First(m => m.BindNo == item.Id);
if (!msgS.Contains(info.SkuNo))
{
@@ -718,7 +723,7 @@
IsDel = "0",
CreateUser = userId,
CreateTime = time
- };
+ };
Db.Insertable(log).ExecuteCommand();
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", notice.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕notice.ASNNo}鐨勫崟鎹挙閿�鐢宠", userId);
}
@@ -752,7 +757,7 @@
{
//娣诲姞鎿嶄綔鏃ュ織
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", notice.ASNNo, "缂栬緫", $"缂栬緫浜嗗崟鎹彿涓簕notice.ASNNo}鐨勫娉ㄤ俊鎭�", userId);
- }
+ }
}
catch (Exception ex)
{
@@ -949,5 +954,5 @@
#endregion
}
-
+
}
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index e07c1df..868e979 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -137,7 +137,7 @@
}
if (strMesage.Contains("-1"))
{
- return Ok(new { code = 0, msg = strMesage });
+ return Ok(new { code = 1, msg = strMesage });
}
else
{
--
Gitblit v1.8.0