From 83288f94aeca3779fb90d62752afa878cefb55bd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 九月 2024 18:06:03 +0800
Subject: [PATCH] 物料添加单个流转卡数量字段，优化批量生产流转卡，到货确认模块
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 75 +
WebTM/views/grf/流转卡TK.grf | 725 +++++++++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 26
WebTM/views/基础资料/公用基础资料/grf/流转卡TK.grf | 725 +++++++++++++++++++++++++
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 134 +++-
6 files changed, 1,632 insertions(+), 59 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 76c6b12..2eb89a2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
// var WEBURL = "http://localhost/API/"; // //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost/API/"; // 娼樻禉娓告湰鍦伴厤缃�
+ // var WEBURL = "http://localhost/API/"; // 娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
@@ -17,10 +17,10 @@
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf"
new file mode 100644
index 0000000..a00f322
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf"
@@ -0,0 +1,725 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='娲惧伐鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇杞﹂棿'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='鍗℃暟閲�'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='宸ュ簭鍙�'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='鐝粍'
+ End
+ Item
+ Name='鏈哄彴'
+ End
+ Item
+ Name='瀹炰綔鏁伴噺'
+ End
+ Item
+ Name='宸ュ簭璇存槑'
+ End
+ Item
+ Name='鐝彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column14'
+ Width=1.69333
+ End
+ Item
+ Name='Column1'
+ Width=1.87854
+ End
+ Item
+ Name='Column2'
+ Width=2.77813
+ End
+ Item
+ Name='Column3'
+ Width=1.61396
+ End
+ Item
+ Name='Column8'
+ Width=2.80458
+ End
+ Item
+ Name='Column9'
+ Width=2.01083
+ End
+ Item
+ Name='Column12'
+ Width=3.38667
+ End
+ Item
+ Name='Column15'
+ Width=1.79917
+ End
+ End
+Object ColumnContent
+ Height=1.19063
+ AdjustRowHeight=F
+ RowsPerPage=6
+ Items ColumnContentCell
+ Item
+ Column='Column14'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox3'
+ Left=0.5
+ Top=-0.8
+ Width=1.5875
+ Height=0.608542
+ SystemVar=RowNo
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Dock=Fill
+ DataField='宸ュ簭鍙�'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ CanGrow=T
+ CanShrink=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐝粍'
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鏈哄彴'
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='瀹炰綔鏁伴噺'
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭璇存槑'
+ End
+ Item
+ Column='Column15'
+ DataField='鐝彿'
+ End
+End
+End
+Object ColumnTitle
+ Height=1.19063
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column14'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐝粍'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏈哄彴'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹炰綔鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭璇存槑'
+ End
+ Item
+ GroupTitle=F
+ Column='Column15'
+ TextAlign=MiddleCenter
+ Text='鐝彿'
+ End
+ End
+End
+End
+Items Parameter
+ Item
+ Name='椤电爜'
+ End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ CanGrow=T
+ CanShrink=T
+ Height=4.60375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=5.00063
+ Width=4.78896
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='娴佽浆鍗�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=11.5888
+ Top=2.19604
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=4.20688
+ Top=1.00542
+ Width=2.98979
+ Height=0.608542
+ TextAlign=MiddleCenter
+ Text='QC妫�鏌ユ柟寮忥細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.60917
+ Top=2.19604
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏃ユ湡锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.2027
+ Top=2.19604
+ Width=3.99521
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.61458
+ Top=2.19604
+ Width=3.78354
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Left=16.5894
+ Top=1.19063
+ Width=2.80458
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='鍏�0椤�'
+ SystemVar=PageCount
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox2'
+ Left=15.3988
+ Top=1.19063
+ Width=2.40771
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='绗�0椤�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=0.79375
+ Top=2.98979
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox19'
+ Left=0.79375
+ Top=2.19604
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='娲惧伐鍗�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=2.40771
+ Top=2.19604
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='娲惧伐鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.59292
+ Top=2.98979
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox21'
+ Left=11.5888
+ Top=3.81
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎵规锛�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=12.1973
+ Top=0.79375
+ Width=1.98438
+ Height=1.21708
+ BarcodeType=QRCode
+ CaptionPosition=None
+ CaptionAlignment=Far
+ CheckSum=T
+ Text='#鍗曟嵁鍙�#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=12.5942
+ Top=3.81
+ Width=4.60375
+ Height=0.582083
+ DataField='鎵规'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=1.5875
+ Top=0.608542
+ Width=2.59292
+ Height=1.40229
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='#浠诲姟鍗曞彿#'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=10.795
+ Top=0.211667
+ Width=1.79917
+ Height=0.582083
+ Text='娴佽浆鍗″彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=12.5942
+ Top=0.211667
+ Width=4.20688
+ Height=0.582083
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox24'
+ Left=0.211667
+ Width=5.79438
+ Height=0.582083
+ Text='浠诲姟鍗曞彿锛歔#浠诲姟鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=7.19667
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=8.59896
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=9.60438
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox2'
+ Left=11.0067
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox27'
+ Left=5.60917
+ Top=2.98979
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox28'
+ Left=11.5888
+ Top=2.98979
+ Width=6.21771
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox29'
+ Left=0.79375
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏁伴噺锛歔#鐢熶骇鏁伴噺#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox30'
+ Left=5.60917
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗℃暟閲忥細[#鍗℃暟閲�#]'
+ End
+ End
+ RepeatOnPage=T
+End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.01083
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Dock=Left
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ End
+ ColumnCount=7
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.6933
+ End
+ Item[2]
+ Width=1.8785
+ End
+ Item[3]
+ Width=2.7781
+ End
+ Item[4]
+ Width=1.614
+ End
+ Item[5]
+ Width=2.8046
+ End
+ Item[6]
+ Width=2.01083
+ End
+ Item[7]
+ Width=5.18583
+ End
+ End
+ Items FreeGridRow
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Text='鍏ュ簱璁板綍'
+ End
+ Item[2,1]
+ Text='棰嗙敤璁板綍'
+ End
+ End
+End
+End
+End
+End
+End
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/Add_Edit_Gy_Material.html" "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/Add_Edit_Gy_Material.html"
index 64f6691..e050fa4 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/Add_Edit_Gy_Material.html"
+++ "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/Add_Edit_Gy_Material.html"
@@ -508,9 +508,9 @@
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -533,6 +533,12 @@
<label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLotcardQty" lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off" value="0">
</div>
</div>
</div>
@@ -1074,7 +1080,7 @@
, "HTela_M": data.姣涚罕鍚嶇О鍙婅鏍�
, "HUnderTela_M": data.搴曚笣
, "HSizing_M": data.瀹氬瀷娴嗘枡
-
+ , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
});
@@ -1325,6 +1331,18 @@
}
}
+ var HLotcardQty = $('#HLotcardQty').val();
+ if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
+ layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HLotcardQty)) {
+ layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var HPERUNITSTANDHOUR = $('#HPERUNITSTANDHOUR').val();
if (HPERUNITSTANDHOUR.substring(HPERUNITSTANDHOUR.length - 1, HPERUNITSTANDHOUR.length) == ".") {
layer.msg("鏍囧噯宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
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/grf/\346\265\201\350\275\254\345\215\241TK.grf" "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/grf/\346\265\201\350\275\254\345\215\241TK.grf"
new file mode 100644
index 0000000..a00f322
--- /dev/null
+++ "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/grf/\346\265\201\350\275\254\345\215\241TK.grf"
@@ -0,0 +1,725 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='娲惧伐鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇杞﹂棿'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='鍗℃暟閲�'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='宸ュ簭鍙�'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='鐝粍'
+ End
+ Item
+ Name='鏈哄彴'
+ End
+ Item
+ Name='瀹炰綔鏁伴噺'
+ End
+ Item
+ Name='宸ュ簭璇存槑'
+ End
+ Item
+ Name='鐝彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column14'
+ Width=1.69333
+ End
+ Item
+ Name='Column1'
+ Width=1.87854
+ End
+ Item
+ Name='Column2'
+ Width=2.77813
+ End
+ Item
+ Name='Column3'
+ Width=1.61396
+ End
+ Item
+ Name='Column8'
+ Width=2.80458
+ End
+ Item
+ Name='Column9'
+ Width=2.01083
+ End
+ Item
+ Name='Column12'
+ Width=3.38667
+ End
+ Item
+ Name='Column15'
+ Width=1.79917
+ End
+ End
+Object ColumnContent
+ Height=1.19063
+ AdjustRowHeight=F
+ RowsPerPage=6
+ Items ColumnContentCell
+ Item
+ Column='Column14'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox3'
+ Left=0.5
+ Top=-0.8
+ Width=1.5875
+ Height=0.608542
+ SystemVar=RowNo
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Dock=Fill
+ DataField='宸ュ簭鍙�'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ CanGrow=T
+ CanShrink=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐝粍'
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鏈哄彴'
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='瀹炰綔鏁伴噺'
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭璇存槑'
+ End
+ Item
+ Column='Column15'
+ DataField='鐝彿'
+ End
+End
+End
+Object ColumnTitle
+ Height=1.19063
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column14'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐝粍'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏈哄彴'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹炰綔鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭璇存槑'
+ End
+ Item
+ GroupTitle=F
+ Column='Column15'
+ TextAlign=MiddleCenter
+ Text='鐝彿'
+ End
+ End
+End
+End
+Items Parameter
+ Item
+ Name='椤电爜'
+ End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ CanGrow=T
+ CanShrink=T
+ Height=4.60375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=5.00063
+ Width=4.78896
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='娴佽浆鍗�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=11.5888
+ Top=2.19604
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=4.20688
+ Top=1.00542
+ Width=2.98979
+ Height=0.608542
+ TextAlign=MiddleCenter
+ Text='QC妫�鏌ユ柟寮忥細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.60917
+ Top=2.19604
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏃ユ湡锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.2027
+ Top=2.19604
+ Width=3.99521
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.61458
+ Top=2.19604
+ Width=3.78354
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Left=16.5894
+ Top=1.19063
+ Width=2.80458
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='鍏�0椤�'
+ SystemVar=PageCount
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox2'
+ Left=15.3988
+ Top=1.19063
+ Width=2.40771
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='绗�0椤�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=0.79375
+ Top=2.98979
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox19'
+ Left=0.79375
+ Top=2.19604
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='娲惧伐鍗�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=2.40771
+ Top=2.19604
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='娲惧伐鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.59292
+ Top=2.98979
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox21'
+ Left=11.5888
+ Top=3.81
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎵规锛�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=12.1973
+ Top=0.79375
+ Width=1.98438
+ Height=1.21708
+ BarcodeType=QRCode
+ CaptionPosition=None
+ CaptionAlignment=Far
+ CheckSum=T
+ Text='#鍗曟嵁鍙�#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=12.5942
+ Top=3.81
+ Width=4.60375
+ Height=0.582083
+ DataField='鎵规'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=1.5875
+ Top=0.608542
+ Width=2.59292
+ Height=1.40229
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='#浠诲姟鍗曞彿#'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=10.795
+ Top=0.211667
+ Width=1.79917
+ Height=0.582083
+ Text='娴佽浆鍗″彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=12.5942
+ Top=0.211667
+ Width=4.20688
+ Height=0.582083
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox24'
+ Left=0.211667
+ Width=5.79438
+ Height=0.582083
+ Text='浠诲姟鍗曞彿锛歔#浠诲姟鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=7.19667
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=8.59896
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=9.60438
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox2'
+ Left=11.0067
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox27'
+ Left=5.60917
+ Top=2.98979
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox28'
+ Left=11.5888
+ Top=2.98979
+ Width=6.21771
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox29'
+ Left=0.79375
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏁伴噺锛歔#鐢熶骇鏁伴噺#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox30'
+ Left=5.60917
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗℃暟閲忥細[#鍗℃暟閲�#]'
+ End
+ End
+ RepeatOnPage=T
+End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.01083
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Dock=Left
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ End
+ ColumnCount=7
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.6933
+ End
+ Item[2]
+ Width=1.8785
+ End
+ Item[3]
+ Width=2.7781
+ End
+ Item[4]
+ Width=1.614
+ End
+ Item[5]
+ Width=2.8046
+ End
+ Item[6]
+ Width=2.01083
+ End
+ Item[7]
+ Width=5.18583
+ End
+ End
+ Items FreeGridRow
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Text='鍏ュ簱璁板綍'
+ End
+ Item[2,1]
+ Text='棰嗙敤璁板綍'
+ End
+ End
+End
+End
+End
+End
+End
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_BatchSplit.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_BatchSplit.html"
index b4a80f5..c139ab5 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_BatchSplit.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_BatchSplit.html"
@@ -45,7 +45,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>-->
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -127,9 +127,8 @@
data[0].HProQty = 0;
data[0].HSheetQty = Number(data[0].HSheetQty) + Number(1);
- switch (obj.event) {
+ switch (obj.event) {
case 'btn-CopyLine':
- var copydata = JSON.stringify(data);
if (data.length <= 0) {
layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
@@ -137,6 +136,19 @@
layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
}
else {
+ //鑾峰彇鏂版祦杞崱鍗曞彿锛屽唴鐮�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ data[0].HInterID = d.data[0].HInterID;
+ data[0].HBillNo = d.data[0].HBillNo;
+ }
+ });
+ var copydata = JSON.stringify(data);
+
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
var HArrIndex = -1;
@@ -154,7 +166,7 @@
//option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
- break;
+ break;
}
});
//#endregion
@@ -186,10 +198,10 @@
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
+ , field = obj.field; //寰楀埌瀛楁
switch (field) {
- case "HProQty":
+ case "HProQty":
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HProQty: value
@@ -232,7 +244,7 @@
} else if (params[1] == null) {
Pub_Close(2);
}
- })
+ })
//#endregion
//#region 椤甸潰鏂规硶
@@ -257,10 +269,14 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110 }
+ , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
- , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170 }
+ , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
, { field: 'HSheetQty', title: '鎷嗗垎娴佽浆鍗″紶鏁�', width: 130 }
+ , { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -270,6 +286,7 @@
"HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
+ , "HInterID": 0, "HBillNo": "", "HBatchNo": ""
}];
option.data = rowdata;
@@ -288,7 +305,22 @@
//缃戞牸鏁版嵁璧嬪��
var subdata = result.data
var rowdata = [];
+ var HInterID = 0;
+ var HBillNo = "";
for (var i = 0; i < subdata.length; i++) {
+
+ //鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ HInterID = d.data[0].HInterID;
+ HBillNo = d.data[0].HBillNo;
+ }
+ });
+
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
@@ -296,6 +328,7 @@
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
, "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
+ , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": ""
}
)
}
@@ -319,10 +352,13 @@
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
, { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
, { field: 'HSheetQty', title: '鎷嗗垎娴佽浆鍗″紶鏁�', width: 130 }
, { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
, data: rowdata
@@ -370,6 +406,8 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
var sSubTable = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
@@ -390,16 +428,18 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
layer.alert(data.Message, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
}
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
}
});
@@ -439,7 +479,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
})
- }
+ }
obj.event = "";
return false;
@@ -453,13 +493,10 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var rows = [];
- var arr = [];
- var ieid = [];
+ var HInterID_Arr = [];
+
for (var i = 0; i < data.length; i++) {
- rows.push(data[i].hmainid.toString());
- arr.push(data[i].hentryid.toString());
- ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
+ HInterID_Arr.push(data[i].HInterID.toString());
}
layer.open({
@@ -469,7 +506,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID_Arr.toString() + "|" + 0 + '&MyMsg=' + HInterID_Arr.toString() + '&Type=HProcessExchange', 'yes']
, resize: false
})
}
@@ -529,7 +566,7 @@
}
}
}
-
+
return true;
}
//#endregion
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index 194bb81..0c140f5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -198,7 +198,8 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
- //鎵弿鏉″舰鐮佹柟娉�
+
+ //鎵弿鏉″舰鐮佹柟娉昻ew
function GetMeesageByBarCode() {
var HBarCode = $('#HBarCode').val();
if (!HBarCode) {
@@ -211,40 +212,82 @@
return;
}
var index = layer.load();
- var sSubStr = table.cache['mainTable'];
- if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- table.render(option);
- return;
- }
- layer.close(index);
- //$.ajax({
- // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
- // type: "GET",
- // data: { "HBarCode": HBarCode, "HInterID": HInterID },
- // success: function (result) {
- // if (result.code == "1") {
- // var sSubStr = table.cache['mainTable'];
- // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- // table.render(option);
- // break;
- // }
- // layer.close(index);
- // }
- // else {
- // layer.close(index);
- // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.close(index);
- // layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- //});
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ success: function (result) {
+ if (result.code == "1") {
+ var sSubStr = table.cache['mainTable'];
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == result.data[0].HMaterID) {
+ sSubStr[i].HSQty += result.data[0].HQty;
+ table.render(option);
+ break;
+ }
+ }
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
$('#HBarCode').val("");
$("#HBarCode").focus();
}
+ ////鎵弿鏉″舰鐮佹柟娉�
+ //function GetMeesageByBarCode() {
+ // var HBarCode = $('#HBarCode').val();
+ // if (!HBarCode) {
+ // layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ // return;
+ // }
+ // var HInterID = $('#HInterID').val();
+ // if (!HInterID) {
+ // layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
+ // return;
+ // }
+ // var index = layer.load();
+ // var sSubStr = table.cache['mainTable'];
+ // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // table.render(option);
+ // return;
+ // }
+ // layer.close(index);
+ // //$.ajax({
+ // // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ // // type: "GET",
+ // // data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ // // success: function (result) {
+ // // if (result.code == "1") {
+ // // var sSubStr = table.cache['mainTable'];
+ // // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // // table.render(option);
+ // // break;
+ // // }
+ // // layer.close(index);
+ // // }
+ // // else {
+ // // layer.close(index);
+ // // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // // }
+ // // },
+ // // error: function (err) {
+ // // layer.close(index);
+ // // layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // // }
+ // //});
+ // $('#HBarCode').val("");
+ // $("#HBarCode").focus();
+ //}
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile.html";
@@ -253,6 +296,7 @@
//瀹℃牳
form.on('submit(btn_Check)', function (data) {//瀹℃牳
var sSubStr = table.cache['mainTable'];
+ var HReturn = "";
for (var i = 0; i < sSubStr.length; i++) {
if (parseInt(sSubStr[i].HSQty) > parseInt(sSubStr[i].HQty)) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓嶈兘瓒呭嚭璁㈠崟鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -262,11 +306,35 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓�0", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (parseInt(sSubStr[i].HSQty) != parseInt(sSubStr[i].HQty)) {
+ HReturn += "绗�" + (i + 1) + "琛�,璁㈠崟鏁伴噺涓庢潯鐮佹暟閲忎笉涓�鑷达紝鏄惁缁х画瀹℃牳<br/>";
+ }
}
+ if (HReturn != "") {
+ layer.confirm(HReturn, {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['纭', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function (index, layero) {
+ //鎸夐挳涓�鍥炶皟
+ set_Aduit();
+ }, function (index) {
+ //鎸夐挳浜屽洖璋�
+ return;
+ });
+ } else {
+ set_Aduit();
+ }
+
+ });
+
+ //瀹℃牳鎸夐挳鏂规硶
+ function set_Aduit() {
var index = layer.load();
var HInterID = $('#HInterID').val();
var HBillNo = $('#HBillNo').val();
+ var sSubStr = table.cache['mainTable'];
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost",
type: "Post",
@@ -291,7 +359,7 @@
layer.close(index);
}
});
- });
+ }
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
--
Gitblit v1.9.1