From 07ba65e2c25a500e2f1659d9d736875956f48cec Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 11 三月 2024 14:37:35 +0800
Subject: [PATCH] 生产订单，工序流转卡 增加 生产白坯要求HRemark_New，生产幅宽HWidth_New、生产克重HWeight_New、产品规格HMaterModel字段，生产订单可以编辑生产白坯要求、生产幅宽、生产克重、产品规格，下推（批量下推）工序流转卡带入生产白坯要求、生产幅宽、生产克重、产品规格
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 67 ++++++++++++----------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 97 +++++++++++++++++---------------
4 files changed, 91 insertions(+), 77 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index 7be9013..8834566 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","select 1");
+ SqlXMLReportData.GenEntireData(this, "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,case when ISNULL(a.鐢熶骇鐧藉澂瑕佹眰,'')='' then a.鐧藉澂瑕佹眰 else a.鐢熶骇鐧藉澂瑕佹眰 end 鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 8327187..6370904 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -168,21 +168,21 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿*</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="display: inline-block;">
</div>
</div>
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 75px;">
- <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 75px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅*</label>
<div class="layui-input-block" style="margin-left: 71px;">
@@ -208,11 +208,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
- <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" value="0">
</div>
</div>
</div>
@@ -240,9 +244,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇骞呭</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
</div>
</div>
</div>
@@ -266,9 +270,11 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧箙瀹�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
+ <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -291,12 +297,6 @@
<input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧鏍�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 56%;">
@@ -306,9 +306,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁㈠崟鍖呰澶囨敞</label>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鐧藉澂瑕佹眰</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HOrderPickRemark" lay-verify="HOrderPickRemark" id="HOrderPickRemark" style="display: inline-block;">
+ <input type="text" class="layui-input" name="HRemark_New" lay-verify="HRemark_New" id="HRemark_New">
</div>
</div>
</div>
@@ -317,6 +317,12 @@
<label class="layui-form-label" style="width: 85px;">搴曢儴澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟鍖呰澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HOrderPickRemark" lay-verify="HOrderPickRemark" id="HOrderPickRemark" style="display: inline-block;">
</div>
</div>
</div>
@@ -1206,8 +1212,9 @@
, "HCusModel": d.data[0].瀹㈡埛瑙勬牸鍨嬪彿
, "HCusMaterNumber": d.data[0].瀹㈡埛鐗╂枡缂栫爜
, "HOrderPickRemark": d.data[0].璁㈠崟鍖呰澶囨敞
- , "HWidth_New": d.data[0].鏂扮櫧鍧棬骞�
- , "HMaterModel_New": d.data[0].鏂扮櫧鍧鏍�
+ , "HWidth_New": d.data[0].鐢熶骇骞呭
+ , "HWeight_New": d.data[0].鐢熶骇鍏嬮噸
+ , "HRemark_New": d.data[0].鐢熶骇鐧藉澂瑕佹眰
//鍏朵粬淇℃伅
, "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
, "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index dc335e3..feca0c3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -140,12 +140,6 @@
<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧箙瀹�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
- </div>
- </div>
<!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鎬昏鍥惧彿</label>
<div class="layui-input-inline">
@@ -174,12 +168,6 @@
<input type="hidden" name="HUnitID" id="HUnitID" value="0">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧鏍�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
- </div>
- </div>
<!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鏉愯川</label>
<div class="layui-input-inline">
@@ -189,25 +177,25 @@
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
- </div>
- </div>-->
+ <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -226,13 +214,19 @@
<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇骞呭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎴愬搧缂栧彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
- </div>
- </div>-->
+ <label class="layui-form-label">鎴愬搧缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
@@ -289,24 +283,29 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鍘熷洜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
- </div>
- </div>-->
+ <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鏍囪</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
- </div>
- </div>-->
+ <label class="layui-form-label">琛ユ枡鏍囪</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;">
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -353,6 +352,12 @@
<label class="layui-form-label" style="width:12.5%">鐧藉澂瑕佹眰</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鐧藉澂瑕佹眰</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark_New" lay-verify="HRemark_New" id="HRemark_New" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -2268,8 +2273,9 @@
, "HSizing": data.瀹氬瀷娴嗘枡
, "HSellDate": data.浜よ揣鏃ユ湡
- , "HWidth_New": data.鏂扮櫧鍧棬骞�
- , "HMaterModel_New": data.鏂扮櫧鍧鏍�
+ , "HWidth_New": data.鐢熶骇骞呭
+ , "HWeight_New": data.鐢熶骇鍏嬮噸
+ , "HRemark_New": data.鐢熶骇鐧藉澂瑕佹眰
, "HMaker": data.鍒跺崟浜�
, "HChecker": data.瀹℃牳浜�
@@ -2579,8 +2585,9 @@
$("#HColorRemark").val(data.鏌撹壊瑕佹眰);
$("#HRemark3").val(data.搴曢儴澶囨敞);
- $("#HWidth_New").val(data.鏂扮櫧鍧棬骞�);
- $("#HMaterModel_New").val(data.鏂扮櫧鍧鏍�);
+ $("#HWidth_New").val(data.鐢熶骇骞呭);
+ $("#HWeight_New").val(data.鐢熶骇鍏嬮噸);
+ $("#HRemark_New").val(data.鐢熶骇鐧藉澂瑕佹眰);
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index c557eaf..303cb31 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -2276,7 +2276,7 @@
function dy(rest) {
var HInterID = rest[num].hmainid.toString();
- var sWhere = "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") order by cast(b.娴佹按鍙� as int)";
+ var sWhere = "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,case when ISNULL(a.鐢熶骇鐧藉澂瑕佹眰,'')='' then a.鐧藉澂瑕佹眰 else a.鐢熶骇鐧藉澂瑕佹眰 end 鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") order by cast(b.娴佹按鍙� as int)";
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
--
Gitblit v1.9.1