From 14ad6bb7c3bb95a4e31cd981e03d7253a38a8c4d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 九月 2025 02:30:36 +0800
Subject: [PATCH] 条码打印更改数据库ip；生成条码修改供应商id传值；生成送货物料信息修改供应商id传值
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 59 +++++++++--------------------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html | 11 +++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx | 4 +
WebSRM/App_Data/MssqlReportData.cs | 14 +-----
4 files changed, 32 insertions(+), 56 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index e339451..80d0878 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -14,18 +14,10 @@
//杩炴帴SQL Server鏁版嵁搴撶殑杩炴帴涓诧紝搴旇淇敼涓轰笌瀹為檯涓�鑷淬�傚鏋滄槸杩愯Grid++Report鏈韩鐨勪緥瀛愶紝搴旇棣栧厛闄勫姞渚嬪瓙鏁版嵁搴撳埌
//SQL Server2000/2005鏁版嵁搴撲笂銆�
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
+ //鎯犲悍
+ public const string SqlConnStr = "Data Source=172.16.72.16;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //娴嬭瘯
//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.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;";
- //
- //澶忓疂
- public const string SqlConnStr = "Data Source=192.168.1.223;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
- //瀹夌憺
- //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
- //娣诲悍绉戞妧
- //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public string sServer;
//public string sDataBase;
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
index bb14d24..d1233e6 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -40,9 +40,9 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+ <label class="layui-form-label"> 渚涘簲鍟嗕唬鐮侊細</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HSupNumber" lay-verify="HSupNumber" id="HSupNumber" readonly="readonly" autocomplete="off">
<input id="HSupID" name="HSupID" type="hidden" />
</div>
</div>
@@ -50,9 +50,9 @@
<label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupName" name="HSupName" type="hidden" />
</div>
</div>
+ </div>
</div>
</div>
@@ -64,11 +64,11 @@
<div class="layui-tab-item layui-show">
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <!--<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn"><i class="layui-icon layui-icon-addition"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>
- </div>
+ </div>-->
</script>
<!-- 鏉＄爜绫诲瀷涓嬫媺妗嗘ā鏉� -->
<script type="text/html" id="barCodeTypeTpl">
@@ -288,7 +288,7 @@
"HKFDQDate": data[i].鏈夋晥鏈�,
"HKFDate": data[i].鐢熶骇鏃ユ湡,
"HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+ "HSupID": data[i].HSupID,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
"HQty": 1, // 榛樿鐢熸垚鏉＄爜鏁伴噺
@@ -592,8 +592,9 @@
, defaultToolbar: ['filter', 'exports']
, limit: 500
, cols: [[
- , { field: 'HBarCode', title: '鏉＄爜', width: 100 }
+ { field: 'HBarCode', title: '鏉＄爜', width: 230, ellipsis: true }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HBarItemID', title: '鏉＄爜ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
/* , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
, { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
@@ -621,11 +622,11 @@
var barcodes = data.data;
// 灏嗘潯鐮佸垪琛ㄨ浆鎹负閫楀彿鍒嗛殧鐨勫瓧绗︿覆
- var barcodeStr = barcodes.join(',');
+ //var barcodeStr = barcodes.join('~');
$.ajax({
type: "GET",
url: GetWEBURL() + "/GetBarcodeDetails",
- data: { barcodes: barcodeStr },
+ data: { barcodes: barcodes },
dataType: "json",
success: function (data_1) {
if (data_1.count != 0) {
@@ -633,10 +634,10 @@
var rowdata_1 = [];
for (var i = 0; i < data.length; i++) {
- if (i == data.length - 1)//鏈�鍚庝竴鏉�
- {
+
rowdata_1.push({
"HMaterID": data[i].HItemID,
+ "HBarItemID": data[i].HBarItemID,
"HBarCode": data[i].HBarCode,
"HMaterNumber": data[i].鐗╂枡浠ｇ爜,
"HMaterShortNumber": "",
@@ -651,37 +652,14 @@
"HKFDQDate": data[i].鏈夋晥鏈�,
"HKFDate": data[i].鐢熶骇鏃ユ湡,
"HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+ "HSupID": data[i].HSupID,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": (data[i].鐢熸垚鏉＄爜鏁伴噺 % data[i].鏍囧噯鍖呰鏁� == 0 ? data[i].鏍囧噯鍖呰鏁�: (data[i].鐢熸垚鏉＄爜鏁伴噺 % data[i].鏍囧噯鍖呰鏁�)), // 鏈鐢熸垚鏉＄爜鏁伴噺
+ "HQty":data[i].鐢熸垚鏉＄爜鏁伴噺 , // 鏈鐢熸垚鏉＄爜鏁伴噺
"biaoqianzhangshu": 1
});
- }
- else {
- rowdata_1.push({
- "HMaterID": data[i].HItemID,
- "HBarCode": data[i].HBarCode,
- "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- "HMaterShortNumber": "",
- "HMaterName": data[i].鐗╂枡鍚嶇О,
- "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- "HMinQty": data[i].鏍囧噯鍖呰鏁�,
- "HBQty": data[i].鏈�灏忓寘瑁呮暟,
- "HSourceBillType": data[i].鏉＄爜绫诲瀷,
- "HBatchNo": data[i].鎵瑰彿,
- "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
- "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
- "HKFDQDate": data[i].鏈夋晥鏈�,
- "HKFDate": data[i].鐢熶骇鏃ユ湡,
- "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
- "HSupName": data[i].渚涘簲鍟嗗悕绉�,
- "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": data[i].鏍囧噯鍖呰鏁�, // 鏈鐢熸垚鏉＄爜鏁伴噺
- "biaoqianzhangshu": 1
- });
- }
+
+
}
@@ -805,7 +783,7 @@
return;
}
for (var j = 0; j < data2.length; j++) {
- rows += data2[j].HMaterID.toString() + ',';
+ rows += data2[j].HBarItemID.toString() + ',';
rows2 += data2[j].HBarCode.toString() + ',';
}
rows = rows.substring(rows.length - 1, 0);
@@ -857,8 +835,9 @@
data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
success: function (result) {
if (result.data.length > 0) {
+ $("#HSupID").val(result.data[0].HItemID);
+ $("#HSupNumber").val(result.data[0].渚涘簲鍟嗕唬鐮�);
$("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
- $("#HSupID").val(result.data[0].渚涘簲鍟嗕唬鐮�);
} else {
layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
}
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
index ad9dac1..03c91e1 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -85,7 +85,7 @@
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <!--<input type="hidden" name="HSupID" id="HSupID" value="0">-->
+ <input type="hidden" name="HUserID" id="HUserID" value="0">
</div>
</div>
@@ -124,7 +124,8 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSupID" id="HSupID" readonly>
+ <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber" readonly>
+ <input type="text" class="layui-input" name="HSupID" id="HSupID" style="display:none;" >
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -707,7 +708,8 @@
$("#HMinPackQty").val(data[0]["鏈�灏忓寘瑁呮暟"]);
$("#HInBoxPackQty").val(data[0]["鏍囧噯鍖呰鏁�"]);
$("#HOutBoxPackQty").val(data[0]["HOutBoxPackQty"]);
- $("#HSupID").val(data[0]["渚涘簲鍟嗕唬鐮�"]);
+ $("#HSupID").val(data[0]["HSupID"]);
+ $("#HSupNumber").val(data[0]["渚涘簲鍟嗕唬鐮�"]);
$("#HSupName").val(data[0]["渚涘簲鍟嗗悕绉�"]);
$("#HMaker").val(data[0]["鍒涘缓浜�"]);
$("#HCheckEmp").val(data[0]["瀹℃牳浜�"]);
@@ -818,7 +820,8 @@
success: function (result) {
if (result.data.length > 0) {
$("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
- $("#HSupID").val(result.data[0].渚涘簲鍟嗕唬鐮�);
+ $("#HSupNumber").val(result.data[0].渚涘簲鍟嗕唬鐮�);
+ $("#HSupID").val(result.data[0].HItemID);
} else {
layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
}
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
index baeb1c4..ef674e2 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
@@ -15,7 +15,9 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")","select 1");
+
}
</script>
</head>
--
Gitblit v1.9.1