From 4994a573f6044dd9fa73ef61d728e91fbe2e7d28 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 09 七月 2025 13:31:48 +0800
Subject: [PATCH] 工艺路线导出报错，三升排产调整
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 5
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 3
WebTM/views/grf/物料条码_海诚（蓝牙）.grf | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 360 insertions(+), 5 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 47ce89d..18cc438 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//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:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
diff --git "a/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232\357\274\210\350\223\235\347\211\231\357\274\211.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232\357\274\210\350\223\235\347\211\231\357\274\211.grf"
new file mode 100644
index 0000000..6f7e17e
--- /dev/null
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232\357\274\210\350\223\235\347\211\231\357\274\211.grf"
@@ -0,0 +1,351 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.5
+ Height=10
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ 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='Column3'
+ Width=9.49854
+ End
+ End
+Object ColumnContent
+ Height=10.0013
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=6.40292
+ Top=5.00063
+ Width=2.59292
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='璁″垝璺熻釜鍙�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=2.80458
+ Top=2.40771
+ Width=3.99521
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐗╂枡鍚嶇О'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=2.80458
+ Top=2.98979
+ Width=3.99521
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=2.80458
+ Top=3.59833
+ Width=3.99521
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Left=2.19604
+ Top=4.39208
+ Width=1.79917
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.19125
+ Top=4.39208
+ Width=2.80458
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鍑哄巶鏃ユ湡'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.79979
+ Top=2.19604
+ Width=2.25
+ Height=2.01083
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#璁㈠崟鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=3
+ Top=1.5
+ Width=5.82083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='渚涘簲鍟�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=0.608542
+ Top=1.5
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='渚涘簲鍟嗭細'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.19604
+ Top=5.00063
+ Width=1.79917
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=TopLeft
+ DataField='妫�楠屽憳'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=0.608542
+ Top=2.40771
+ Width=2.19604
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐗╂枡缂栫爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=3.99521
+ Top=4.39208
+ Width=2.2
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍑哄巶鏃ユ湡锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox5'
+ Left=0.608542
+ Top=2.98979
+ Width=2.19604
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐗╂枡鍚嶇О锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox6'
+ Left=0.608542
+ Top=3.59833
+ Width=2.19604
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox7'
+ Left=0.608542
+ Top=4.39208
+ Width=1.5875
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏁伴噺锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=0.608542
+ Top=5.00063
+ Width=1.5875
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='妫�楠屽憳锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox9'
+ Left=3.99521
+ Top=5.00063
+ Width=2.40771
+ Height=0.5
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁″垝璺熻釜鍙凤細'
+ End
+ End
+ End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index b5b909b..157cbe1 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -87,13 +87,13 @@
<option value="1">鐢熶骇璁㈠崟</option>
<option value="2">鐢熶骇姹囨姤鍗�</option>
<option value="3">閲囪喘璁㈠崟</option>
- <!--<option value="4">鏀舵枡閫氱煡鍗�</option>
+ <option value="4">鏀舵枡閫氱煡鍗�</option>
<option value="5">濮斿璁㈠崟</option>
<option value="6">鐢熶骇鍏ュ簱鍗�</option>
<option value="7">閲囪喘鍏ュ簱鍗�</option>
<option value="8">閿�鍞��璐у崟</option>
<option value="9">鐢熶骇閫�鏂欏崟</option>
- <option value="10">宸ュ簭娴佽浆鍗�</option>-->
+ <option value="10">宸ュ簭娴佽浆鍗�</option>
<option value="11">閿�鍞嚭搴撳崟</option>
<option value="12">棰嗘枡鍑哄簱鍗�</option>
</select>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 1d42613..99c612f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -2898,7 +2898,10 @@
SDSum += TableData[i][option.cols[0][j].field];
}
}
-
+ //璺宠繃 閿佸畾宸ュ崟
+ if (option.data[i].閿佸畾宸ュ崟 == "鏄�") {
+ continue;
+ }
//鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
lMainID = option.data[i]["HICMOInterID"];
sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 9f5b8c6..2871e59 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -522,6 +522,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-150'
+ , title: '宸ヨ壓璺嚎'
, page: false
, limit: 50
, done: function (res, curr, count) {
@@ -1627,7 +1628,7 @@
}
});
if (result.count == 1) {
- table.exportFile(ins.config.id, data, "xls");
+ table.exportFile('mainTable', data, "xls");
layer.close(wait);
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
--
Gitblit v1.9.1