From b28acfba24adf4f1d2b567d0e2d99c29bd8c6d03 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 六月 2024 13:50:53 +0800
Subject: [PATCH] 1
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html | 2
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx.designer.cs | 16 +++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html | 79 ++++++--------------------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html | 2
WebSRM/Web.config | 5 +
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 20 ++++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 25 +++++++-
WebSRM/login.html | 2
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx | 1
WebSRM/App_Data/MssqlReportData.cs | 4 +
10 files changed, 73 insertions(+), 83 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index 0c6d544..5818ef5 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -16,7 +16,7 @@
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//鍑礉
- public const string SqlConnStr = "Data Source=192.168.1.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=192.168.50.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//瀹夌憺
//public const string SqlConnStr = "Data Source=192.168.80.91;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//
@@ -102,7 +102,9 @@
// conn.Close();
// LogService.Write("Connection close.");
//}
+ LogService.Write("YES1");
SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ LogService.Write("YES2");
SqlDataAdapter ReportDataAdapter = new SqlDataAdapter(QuerySQL, ReportConn);
DataSet ReportDataSet = new DataSet();
ReportConn.Open();
diff --git a/WebSRM/Web.config b/WebSRM/Web.config
index 5613b4e..fab8da2 100644
--- a/WebSRM/Web.config
+++ b/WebSRM/Web.config
@@ -79,6 +79,11 @@
<add value="login.html" />
</files>
</defaultDocument>
+ <security>
+ <requestFiltering>
+ <requestLimits maxAllowedContentLength="10485760" maxUrl="10485760" maxQueryString="10485760" />
+ </requestFiltering>
+ </security>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index f8cbeb4..fe8a934 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -154,25 +154,26 @@
//璁＄畻鏈夋晥鏈熻嚦
if (HExpUnit == "Y") {//骞�
date = new Date(date);
- console.log(date.getFullYear(date));
date.setYear(date.getFullYear(date) + HKFPeriod);
- console.log(Format(date, "yyyy-MM-dd"));
+ date.setDate(date.getDate(date) - 1);
return Format(date, "yyyy-MM-dd");
}
if (HExpUnit == "M") {//鏈�
date = new Date(date);
date.setMonth(date.getMonth(date) + HKFPeriod);
+ date.setDate(date.getDate(date) - 1);
return Format(date, "yyyy-MM-dd");
}
if (HExpUnit == "D") {//鏃�
date = new Date(date);
date.setDate(date.getDate(date) + HKFPeriod);
- console.log(Format(date, "yyyy-MM-dd"));
+ date.setDate(date.getDate(date) - 1);
+
return Format(date, "yyyy-MM-dd");
}
- else { //瀹夌憺璁＄畻鏂瑰紡
+ else { //瀹夌憺璁＄畻鏂瑰紡
if (days == undefined || days == '') {
days = 1;
}
@@ -459,7 +460,7 @@
}
//鑾峰彇涓嬫爣
index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
- if (index === -1) {
+ if (index === -1 || _sSubStr[i].HIsSplit == 0) {
//濡傛灉鏁扮粍涓病鏈夊綋鍓嶆暟鎹紝鍒欏皢鏁版嵁娣诲姞杩涙暟缁勪腑
newArray.push(_sSubStr[i]);
@@ -467,7 +468,7 @@
if (newArray[index].HPOOrderBillNo == _sSubStr[i].HPOOrderBillNo) {
//濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠ｇ爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
- }
+ }
}
}
@@ -701,6 +702,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
, { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+ , { field: 'HIsSplit', title: '鏄惁鎷嗗垎', width: 150, hide: true } //0鍚︼紝1鏄�
]]
, done: function (res, curr, count) {
@@ -789,9 +791,11 @@
, "HSupName": data[i].HSupName
, "HSupBatchNo": data[i].HSupBatchNo
, "HSupMaterNumber": data[i].HSupMaterNumber
+ , "HEXPUNIT": data[i].HEXPUNIT
+ , "HIsSplit": 1
}
- //oldData.push(data1);
- oldData.splice(dataindex, 0, data1);
+ oldData.push(data1);
+ //oldData.splice(dataindex, 0, data1);
};
break;
}
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html
index 93e508c..5d83244 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html
@@ -58,7 +58,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -125,7 +125,7 @@
</select>
</div>
</div>-->
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">鏄惁宸蹭笅鎺ㄩ�佽揣鍗�</label>
<div class="layui-input-block">
<select id="HISGenerate" name="HISGenerate" lay-filter="">
@@ -266,20 +266,20 @@
, { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', sort: true }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
, { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 180, sort: true }
- , { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
+ , { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }//
, { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', sort: true, hide: true }
, { field: '濮斿璁㈠崟鍙�', title: '濮斿璁㈠崟鍙�', sort: true, hide: true }
, { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', sort: true }
, { field: '鍓╀綑閫佽揣鏁伴噺', title: '鍓╀綑閫佽揣鏁伴噺', sort: true }
, { field: '鍏抽棴鐘舵��', title: '鍏抽棴鐘舵��', sort: true }
- , { field: '鍙樻洿鐘舵��', title: '鍙樻洿鐘舵��', sort: true }
+ , { field: '鍙樻洿鐘舵��', title: '鍙樻洿鐘舵��', sort: true }//
, { field: '濮斿缁勭粐', title: '濮斿缁勭粐', sort: true }
, { field: '閲囪喘缁勭粐', title: '閲囪喘缁勭粐', sort: true }
- , { field: '纭浜�', title: '纭浜�', sort: true, hide: true }
- , { field: '纭鏃ユ湡', title: '纭鏃ユ湡', sort: true, hide: true }
- , { field: '椹冲洖浜�', title: '椹冲洖浜�', sort: true, hide: true }
- , { field: '椹冲洖鏃ユ湡', title: '椹冲洖鏃ユ湡', sort: true, hide: true }
- , { field: '椹冲洖鐞嗙敱', title: '椹冲洖鐞嗙敱', sort: true, hide: true }
+ , { field: '纭浜�', title: '纭浜�', sort: true, hide: true }//
+ , { field: '纭鏃ユ湡', title: '纭鏃ユ湡', sort: true, hide: true }//
+ , { field: '椹冲洖浜�', title: '椹冲洖浜�', sort: true, hide: true }//
+ , { field: '椹冲洖鏃ユ湡', title: '椹冲洖鏃ユ湡', sort: true, hide: true }//
+ , { field: '椹冲洖鐞嗙敱', title: '椹冲洖鐞嗙敱', sort: true, hide: true }//
]]
//, skin: 'row' //琛ㄦ牸椋庢牸
// , even: true
@@ -496,10 +496,10 @@
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
- //if ($("#HModel").val() != "")
- // sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
if ($("#HClStatus").val() != "")
sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+ //if ($("#HModel").val() != "")
+ // sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
//if ($("#HPURCHASEORGID").val() != "")
// sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
//if ($("#HDate1").val() != "") {
@@ -508,42 +508,13 @@
//if ($("#HDate2").val() != "") {
// sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
//}
- if ($("#HISGenerate").val() != "") {
- if ($("#HISGenerate").val() == "鏄�") {
- sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
- }
- else if ($("#HISGenerate").val() == "鍚�") {
- sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
- }
- }
- //var Time = $("#Time").val();
- //var dd = new Date();
- //var dt;
- //switch (Time) {
- // case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
- // case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
- // case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
- // case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
- // case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
- // case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
- // case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
- // default: dd = new Date(dd.setDate(dd.getDate()));
- //}
- //dt = dd.getFullYear().toString();
- //if (dd.getMonth() + 1 < 10) {
- // dt = dt + "-0" + (dd.getMonth() + 1).toString();
- //}
- //else {
- // dt = dt + "-0" + (dd.getMonth() + 1).toString();
- //}
- //if (dd.getDate() < 10) {
- // dt = dt + "-0" + dd.getDate().toString();
- //}
- //else {
- // dt = dt + "-" + dd.getDate().toString();
- //}
- //if (Time != 8) {
- // sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+ //if ($("#HISGenerate").val() != "") {
+ // if ($("#HISGenerate").val() == "鏄�") {
+ // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
+ // }
+ // else if ($("#HISGenerate").val() == "鍚�") {
+ // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
+ // }
//}
sql = sqlWhere;
//浠庣涓�椤靛紑濮�
@@ -560,20 +531,6 @@
f_Bhjq: function () { //鎷掔粷
},
- //JSreload: function () {
- // var demoReload = $('#test-table-demoReload');
- // //鎵ц閲嶈浇
- // table.JSreload('mainTable', {
- // page: {
- // curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
- // }
- // , where: {
- // key: {
- // id: demoReload.val()
- // }
- // }
- // });
- //}
};
$('.test-table-reload-btn .layui-btn').on('click', function () {
var type = $(this).data('type');
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
index c9cac9a..e198907 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
@@ -411,7 +411,7 @@
layer.close(wait);
} else {
layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
+ layer.msg(data1.Message, {time:2000, icon: 5 });
}
},
error: function (result) {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 97bc169..ba19f8f 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -127,6 +127,16 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">涓氬姟缁堟</label>
+ <div class="layui-input-block">
+ <select id="HIsStop" name="HIsStop" lay-filter="">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�" selected>鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -472,7 +482,7 @@
var wait = layer.load();//閬僵
$.ajax({
type: "POST",
- url: GetWEBURL() + "GetPOOrderBill",
+ url: GetWEBURL() + "GetPOOrderBill", //H_p_SRM_POOrderBillList
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
success: function (data1) {
@@ -567,10 +577,10 @@
if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "瀹夌憺闆嗗洟")
sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^";
if ($("#HDate1").val() != "") {
- sqlWhere += " and 閲囪喘鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+ sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
}
if ($("#HDate2").val() != "") {
- sqlWhere += " and 閲囪喘鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+ sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
}
if ($("#HISGenerate").val() != "") {
if ($("#HISGenerate").val() == "鏄�") {
@@ -596,7 +606,16 @@
else if ($("#HIsFreeze").val() == "涓氬姟鍐荤粨") {
sqlWhere += " and 涓氬姟鍐荤粨 = ^^涓氬姟鍐荤粨^^";
}
+ }
+ if ($("#HIsStop").val() != "") {
+ if ($("#HIsStop").val() == "鏄�") {
+ sqlWhere += " and 涓氬姟缁堟 = ^^涓氬姟缁堟^^";
+ }
+ else if ($("#HIsStop").val() == "鍚�") {
+ sqlWhere += " and 涓氬姟缁堟 = ^^姝ｅ父^^";
+ }
}
+
var Time = $("#Time").val();
if (Time > 0) {
var dd = new Date();
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html
index 7624989..f53a54a 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html
@@ -227,7 +227,7 @@
} else {
table.render(option);
layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
+ layer.msg(data1.Message, { time:2000,icon: 5 });
}
},
error: function (result) {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx
index eb3cd77..46d2e77 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx
@@ -15,6 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ LogService.Write("select * from h_v_SRM_POInStockBillList where hmainid="+Request.Params["linterid"] +" order by 鐗╂枡浠ｇ爜");
SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_POInStockBillList where hmainid=" + Request.Params["linterid"]+ " order by 鐗╂枡浠ｇ爜");
}
</script>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx.designer.cs b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx.designer.cs
index 418f859..6eef94b 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx.designer.cs
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM {
-
-
- public partial class xmlSRM_POInStockBill {
-
+namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM
+{
+
+
+ public partial class xmlSRM_POInStockBill
+ {
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
diff --git a/WebSRM/login.html b/WebSRM/login.html
index 1710b0f..07a600a 100644
--- a/WebSRM/login.html
+++ b/WebSRM/login.html
@@ -54,7 +54,7 @@
<!--椤哄簭涓嶈兘鏀瑰彉-->
<script src="layuiAdmin.std-v1.2.1/src/js/jquery.min.js"></script>
<script src="layuiAdmin.std-v1.2.1/src/js/supersized.3.2.7.min.js"></script>
- <script src="layuiAdmin.std-v1.2.1/src/js/supersized-init.js"></script>
+ <script src="layuiAdmin.std-v1.2.1/src/js/supersized-init.js"></script><!--鐧诲綍鍥剧墖-->
<script src="layuiAdmin.std-v1.2.1/src/js/jquery-1.9.1.min.js"></script>
<script src="layuiAdmin.std-v1.2.1/src/js/jquery.selectlist.js"></script>
<script src="layuiAdmin.std-v1.2.1/src/layuiadmin/layui/layui.js"></script>
--
Gitblit v1.9.1