From 2bcd2e34b928daf86ecb1c478a7b8a54fd698c7e Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期一, 30 十二月 2024 19:11:00 +0800
Subject: [PATCH] 修改问题
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 6 ++----
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index c45524f..bef5bba 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -121,7 +121,7 @@
{{# function GetBtn1(d){
var html = '';
var TypeValue = $("#Type").val();
- if(TypeValue=='5' || TypeValue=='6' || TypeValue=='7'){
+ if(TypeValue=='6' || TypeValue=='7'){
if(d.LotNo==null || d.LotNo==undefined || d.LotNo==''){
html+= '<input type="text" class="input-dis" value="" disabled>';
}else{
@@ -519,9 +519,7 @@
break;
case "1": //閲囪喘鍏ュ簱
case "5": //鍏跺畠鍏ュ簱
- TypeNum = 1;
- console.log(TypeNum)
- break;
+
case "0": //鎴愬搧鍏ュ簱
case "2": //涓棿鍝佸叆搴�
case "4": //杞﹂棿浣欐枡鍏ュ簱
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 05fc122..b76bf71 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -277,7 +277,7 @@
string sqlString = string.Empty;
string sqlDetailStr = string.Empty;
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- var TypeLot = "1, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
+ var TypeLot = "1, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
try
{
@@ -325,7 +325,7 @@
}
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- if (model.Type == "5" || model.Type == "6" || model.Type == "7")//model.Type == "1" ||
+ if (model.Type == "6" || model.Type == "7")//model.Type == "1" ||
{
if (!string.IsNullOrWhiteSpace(detailModel.LotNo))
{
@@ -357,7 +357,7 @@
detailModel.LotNo = maxLotNo;
}
}
- if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4")
+ if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4" || model.Type == "5")
{
if (string.IsNullOrWhiteSpace(detailModel.LotNo))
{
--
Gitblit v1.8.0