From c71eab493f627d0d932b717624859b1c21359b58 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 24 六月 2022 13:09:16 +0800
Subject: [PATCH] 安瑞调整
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx.cs | 7 ++++++-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 21 +++++++++++++++++----
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 1 +
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 1 +
WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html | 2 +-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs | 6 ++++--
9 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
index 5682dd8..541c462 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
@@ -228,7 +228,7 @@
, data = checkStatus.data;
var OpenTmp = data[0].妯℃澘鍚嶇О;
if (OpenTmp == '鏉＄爜') {
- window.open("../../views/SRM/HBarPlanPrint.html?linterid=&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
} else {
window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
}
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx.cs b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx.cs
index 5ec9d2b..3af199a 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx.cs
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx.cs
@@ -22,9 +22,14 @@
using (StreamReader streamRead = new StreamReader(stream))
{
linterid = streamRead.ReadToEnd();
+ LogService.Write("Cache锛�"+ linterid);
}
//linterid = JsonConvert.SerializeObject(linterid);
- MemoryCacheHelper.SetCache("linterid", linterid);
+ var Cachekey = linterid.Split(';')[1];
+ var Cachevalue = linterid.Split(';')[0];
+ LogService.Write("Cachekey锛�" + Cachekey);
+ LogService.Write("Cachevalue锛�" + Cachevalue);
+ MemoryCacheHelper.SetCache(Cachekey, Cachevalue);
//HttpContext.Current.Session.Remove("linterid");
//HttpContext.Current.Session.Add("linterid", linterid);
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html
index 5b216f2..2b58246 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html
@@ -65,10 +65,10 @@
//CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
break;
- case "SRM_POOrderBillList"://閲囪喘璁㈠崟
+ case "SRM_POOrderBillList"://閲囪喘璁㈠崟鐗╂枡鏉＄爜鎵撳嵃
console.log(1)
//CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
- CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_PoBarCodeBillList.aspx?linterid=1", true, "");
+ CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_PoBarCodeBillList.aspx?linterid=" + value, true, "");
console.log(2)
break;
case "SRM_POInStockBillList"://閫佽揣鍗曟墦鍗�
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 75c4aaa..7f1a2be 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
@@ -539,7 +539,7 @@
type: "POST",
url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "linterid": rows.toString() },
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
dataType: "json",
success: function (data) {
layer.closeAll("loading");
@@ -556,7 +556,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/BaseSet/SRM_OpenTmpList.html?Type=' + openTmpListType, 'yes']
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
@@ -610,8 +610,8 @@
//, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
//, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, edit: 'text', event: "inputHKFPeriod" }//
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate" }//
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, event: "inputHKFPeriod" }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150/*, data_field: 'HKFDQDate', event: "chooseHKFDQDate" */}//
//, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -827,6 +827,8 @@
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HQty == 0)
+ continue;
if (sSubStr[i].HQty > sSubStr[i].HNotBarcodeCount) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏉＄爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -835,6 +837,17 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍖呰鏁伴噺涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (sSubStr[i].HKFDate == '' || sSubStr[i].HKFDQDate == '') {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡鎴栧埌鏈熸棩鏈熶笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HBatchNo == '') {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ //HKFDate 鐢熶骇鏃ユ湡
+ //HKFDQDate 鍒版湡鏃ユ湡
+ //HBatchNo 鎵规
}
}
else {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index 7a56662..fe0e495 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -293,7 +293,7 @@
type: "POST",
url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "linterid": rows.toString() },
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"]},
dataType: "json",
success: function (data) {
layer.closeAll("loading");
@@ -311,7 +311,7 @@
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
//, content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=SRM_POOrderBillList', 'yes']
- , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=&HBarcode=&Type=SRM_POOrderBillList', 'yes']
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
index 3b2c4f3..0561810 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
@@ -130,6 +130,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
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 61ba2d8..2307db3 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
@@ -130,6 +130,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
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 c91e63b..614392e 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
@@ -9,7 +9,7 @@
<script runat="server">
protected void Page_Load(object sender, EventArgs e)
{
- var ids = Request.Params["linterid"];
+ var ids = Request.Params["linterid"];
var idsArray = ids.Split(',');
var PrintIds = "";
for (int i = 0; i < idsArray.Length; i++)
@@ -17,7 +17,7 @@
PrintIds += "'" + idsArray[i] + "',";
}
PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
- LogService.Write(PrintIds);
+ //LogService.Write(PrintIds);
SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_POInStockBillList where HPrintId in("+ PrintIds+") order by 鐗╂枡浠ｇ爜");
}
</script>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs
index 00108d4..4c8f0e1 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs
@@ -17,8 +17,10 @@
{
try
{
- var linterid = MemoryCacheHelper.GetCache("linterid");
- LogService.Write("娴嬭瘯linterid:" + linterid);
+ var HuserName = Request.Params["linterid"];//鐢ㄦ埛鍚嶇О
+ LogService.Write("HuserName锛�" + HuserName);
+ var linterid = MemoryCacheHelper.GetCache(HuserName);
+ LogService.Write("linterid锛�" + linterid);
SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡缂栫爜,鍐呭绠辨爣璇�,褰撳墠鎵樻暟");
}
catch(ThreadAbortException ex)
--
Gitblit v1.9.1