From f0719da71fc0caa65c724ca5392cc3295bf3a9c3 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 08 八月 2022 11:03:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/App_Data/MssqlReportData.cs | 3
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 2
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 114 +++++----
WebTM/views/grf/瑞与祺江苏打印模板.grf | 42 ++
WebTM/views/user/login.html | 34 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 53 ++-
WebTM/views/index_Mobile.html | 6
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 4
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html | 1
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 3
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 83 +++---
WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html | 311 +++++++++++++++++++++++++
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html | 12
WebTM/views/index.html | 1
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 12
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 1
WebTM/WebTM.csproj | 1
WebTM/views/仓存管理/条码库存/KF_ICInventoryByMaterID.html | 33 ++
19 files changed, 574 insertions(+), 144 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index bfbbb2c..b606bc3 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -19,10 +19,11 @@
//public const string SqlConnStr = "Data Source=.;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;";//ch娴嬭瘯
//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;";//YL娴嬭瘯
- 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=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.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
//public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
+ public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public string sServer;
//public string sDataBase;
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8529e6f..cae0eff 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -885,6 +885,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatFormImport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ICMOSortBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
diff --git "a/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf" "b/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
index 6ca3e1b..6c8f328 100644
--- "a/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
+++ "b/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
@@ -105,6 +105,9 @@
Item
Name='瀛愪欢瑙勬牸'
End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
End
End
Items Column
@@ -373,7 +376,7 @@
Items ReportHeader
Item
Name='ReportHeader1'
- Height=4.39208
+ Height=5.00063
Items Control
Item
Type=FreeGrid
@@ -384,6 +387,7 @@
Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
End
ColumnCount=9
+ RowCount=6
Items FreeGridColumn
Item[1]
Width=2.06375
@@ -416,8 +420,8 @@
Item
Type=Barcode
Name='Barcode1'
- Left=5.21229
- Width=3.175
+ Left=5.60917
+ Width=3.20146
Height=1.5875
BarcodeType=QRCode
CaptionPosition=None
@@ -426,9 +430,9 @@
Item
Type=FieldBox
Name='FieldBox1'
- Left=13.9965
+ Left=10.3981
Top=0.211667
- Width=4.39208
+ Width=3.20146
Height=1.19063
ShrinkFontToFit=T
DataField='鍗曟嵁鍙�'
@@ -438,7 +442,7 @@
Name='StaticBox1'
Left=0.211667
Top=0.211667
- Width=4.39208
+ Width=5.00063
Height=1.19063
Object Font
Name='瀹嬩綋'
@@ -451,9 +455,9 @@
Item
Type=StaticBox
Name='StaticBox2'
- Left=12.991
+ Left=8.99583
Top=0.211667
- Width=0.820208
+ Width=0.79375
Height=1.19063
Object Font
Name='瀹嬩綋'
@@ -462,6 +466,14 @@
Charset=134
End
Text='ID'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=14.3933
+ Width=4.41854
+ Height=1.5875
+ Text='鍗曟嵁鍙�'
End
End
ColSpan=9
@@ -587,6 +599,20 @@
End
ColSpan=2
End
+ Item[6,1]
+ Text='鏁伴噺'
+ End
+ Item[6,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Dock=Fill
+ DataField='鐢熶骇鏁伴噺'
+ End
+ End
+ End
End
End
End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 4ded5e8..3d23fc3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -378,6 +378,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
</dl>
</dd>
<dd>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 7fab2c8..0e17adb 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -429,12 +429,6 @@
搴撳瓨鏌ヨ
</a>
</dd>
- <dd>
- <a href="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Check.html" target="main_self_frame" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鏀舵枡閫氱煡鍗曞鏍�
- </a>
- </dd>
</dl>
</li>
<!-- 璁惧绠＄悊 -->
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index a887f3d..cf6d621 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -121,10 +121,15 @@
}
$("#Organization").append(Organization);
form.render('select');
+
+ //璇诲彇閰嶇疆鏂囦欢
+ get_ReadConfigFile();
}
layer.closeAll("loading");
}
})
+
+
//form.render();
@@ -152,6 +157,33 @@
$("#LAY-user-login-password").focus();
}
})
+
+
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("data");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#LAY-user-login-username").val(data2["UserID"]);
+ $("#Organization").val(data2["OrgID"]);
+ form.render('select');
+ }
+ console.log(JSON.parse(data));
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.clear();
+ var data = {
+ UserID: sessionStorage["Czybm"]
+ , OrgID: sessionStorage["OrganizationID"]
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("data", JSON.stringify(data));
+ }
+
//鐧诲綍
function loging() {
if ($("#Organization").val() == 0) {
@@ -211,6 +243,7 @@
} else {//PC绔�
window.location.href = '../../views/index.html'
}
+ get_WriteConfigFile();
}
else {
// $("#verifycode").click();
@@ -225,6 +258,7 @@
}
})
}
+
function playSound() {
var audio = document.getElementById("cs");
if (audio == null)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
index 99231a2..1484df6 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
@@ -237,8 +237,16 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1207'
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
index 2c9cd23..5d1aaf0 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
@@ -174,7 +174,34 @@
}
};
}
-
+ //鎵粨浣�
+ $('#HStockPlaceName').on('keydown', function (event) {
+ var HBarCode = $('#HStockPlaceName').val()
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceName").val(result.data[0].HName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HWHID").val(result.data[0].HWHID);
+ $("#HWHNAME").val(result.data[0].HWhName);
+ element.tabChange('tab-POStockInBill', '2');
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+ }
+ });
//閫夋嫨浠撳簱
form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
@@ -321,6 +348,9 @@
for (var i = 0; i < data.length; i++) {
if (data[i].name == '鐗╂枡ID' || data[i].name == '杈呭姪灞炴�D' || data[i].name == '浠撳簱ID' || data[i].name == '浠撲綅ID') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鏁伴噺' || data[i].name == '绠辨暟')
+ {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, page: true});
}
else {
switch (data[i].Type) {
@@ -342,6 +372,7 @@
, height: 550
, page: true
, cellMinWidth: 90
+ , totalRow: true
, limit: 50
, limits: [50, 500, 5000, 20000]
});
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 7506e33..f2f53a9 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.GenOneRecordset(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.婧愬崟瀹㈡埛缂栫爜,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
+ SqlXMLReportData.GenOneRecordset(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,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="+Request.Params["linterid"]);
}
</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_ICMOBillList.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_ICMOBillList.html"
index 1acef17..70c0ab1 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_ICMOBillList.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_ICMOBillList.html"
@@ -328,6 +328,7 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115 }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
, { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index 00029ff..13c666a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -109,9 +109,6 @@
</body>
</html>
<script>
- var treeCkData = { id: 0 };
- var TagId = "";
- var TagParentId = "";
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
new file mode 100644
index 0000000..1c0ac8e
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
@@ -0,0 +1,311 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢熶骇璁″垝鏌ヨ</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">榻愭枡</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">缂烘枡</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">鎾ら攢</button>
+ </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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="HBillNo" id="HBillNo">
+ </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: 185px;">
+ <select name="Organization" id="Organization" lay-verify="Organization">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+
+ </div>
+ <div class="layui-row" style="margin: 10px 0 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鐢熶骇缁勭粐鍔犺浇
+ Organ();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-110'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMainID', title: 'hmainid', hide: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 100 }
+ , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 120 }
+ , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '鐘舵��', title: '鐘舵��' }
+ , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
+ , { field: '鏈棩璁″垝', title: '鏈棩璁″垝' }
+ , { field: '澶囨枡鐘舵��', title: '澶囨枡鐘舵��' }
+ , { field: '浠撳簱纭', title: '浠撳簱纭' }
+ , { field: '浠撳簱纭鏃堕棿', title: '浠撳簱纭鏃堕棿' }
+ , { field: '鎵ц纭', title: '鎵ц纭' }
+ , { field: '鎵ц纭鏃堕棿', title: '鎵ц纭鏃堕棿' }
+ , { field: '鏈棩瀹屽伐', title: '鏈棩瀹屽伐' }
+ , { field: '鎬昏鍒掓暟', title: '鎬昏鍒掓暟' }
+ , { field: '瀹屽伐鏁�', title: '瀹屽伐鏁�' }
+ , { field: '瀹屽伐鏍囪', title: '瀹屽伐鏍囪' }
+ , { field: '浼樺厛绾�0', title: '浼樺厛绾�' }
+ ]]
+ };
+ }
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '<option style="color:blue;" value="">缁勭粐</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#Organization").append(Organization);
+ $("#Organization").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_ICMOSortBill/JIT_ICMOSortBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBillNo = $("#HBillNo").val();
+ var Organization = $("#Organization").val();//閲囪喘缁勭粐
+ var HWorkShopIDName = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
+ var HBTimes = $("#HBTimes").val();//鏃ユ湡
+ var HETimes = $("#HETimes").val();//鑷�
+ var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡缂栫爜
+ var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
+
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (Organization) {
+ sWhere += " and HProdORGID = '" + Organization + "'";
+ }
+ if (HWorkShopIDName) {
+ sWhere += " and 鐢熶骇杞﹂棿 = '" + HWorkShopIDName + "'";
+ }
+ if (HBTimes != "" && HETimes != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBTimes + "' and '" + HETimes + "' ";
+ }
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like'%" + HMaterName + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like'%" + HMaterNumber + "%'";
+ }
+ if (HSeOrderBillNo) {
+ sWhere += " and 閿�鍞鍗曞彿 like'%" + HSeOrderBillNo + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBillNo").val("");
+ $("#Organization").val("");//閲囪喘缁勭粐
+ $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+ $("#HWorkShopID").val("");//鐢熶骇杞﹂棿
+ $("#HBTimes").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//鏃ユ湡
+ $("#HETimes").val(Format(new Date(), "yyyy-MM-dd"));//鑷�
+ $("#HMaterName").val("");//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val("");//鐗╂枡缂栫爜
+ $("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
+ sWhere = "";
+ }
+ //#endregion
+
+ //鐢熶骇杞﹂棿鍒楄〃
+ function btnHWorkShopID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
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_RoutingBill.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_RoutingBill.html"
index 8489a92..ffb0558 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_RoutingBill.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_RoutingBill.html"
@@ -479,11 +479,11 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+ //var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
+ //linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -500,7 +500,7 @@
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
//绂佺敤缁勭粐閫夐」
$("#HOrgID").attr("disabled", true);
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -1326,9 +1326,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
type: "GET",
@@ -1350,7 +1350,7 @@
, "HName": d.data[0].宸ヨ壓鍚嶇О
, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜
, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterID": d.data[0].hmaterid
+ , "HMaterID": d.data[0].HMaterID
, "HUnitName": d.data[0].璁￠噺鍗曚綅
, "HUnitID": d.data[0].hunitid
, "HMainTimeUnit": d.data[0].杩愯鏃堕棿鍗曚綅
@@ -1377,40 +1377,47 @@
, "HOrgID": d.data[0].HOrgID
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HProcNo": d.data[0].宸ュ簭鍙�, "HProcID_S": d.data[0].宸ユ, "HProcType": d.data[0].宸ュ簭绫诲瀷, "HCenterID_S": d.data[0].HCenterID_S, "HCenterID_SName": d.data[0].浜х嚎涓績
- , "HWorkQty_S": d.data[0].浜х嚎浜ц兘, "HSubStdEmpQty_S": d.data[0].浜х嚎浜烘暟, "HMouldNo": d.data[0].妯″叿缂栧彿, "HChangeMould": d.data[0].鎹㈡ā鏃堕棿, "HPackStd": d.data[0].鍛ㄨ浆绠辨爣鍑�
- , "HPack": d.data[0].鍛ㄨ浆绠�, "HPutArea": d.data[0].鏆傛斁鍖�, "HMyWorkDays": d.data[0].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[0].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[0].宸ュ簭
- , "HProcID": d.data[0].hprocid, "宸ヤ綔涓績浠ｇ爜": d.data[0].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[0].HCenterID, "宸ヤ綔涓績": d.data[0].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[0].HSupID
- , "渚涘簲鍟嗕唬鐮�": d.data[0].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[0].渚涘簲鍟�, "HSupFlag": d.data[0].濮斿鏍囪 == 0 ? false : true, "HTimeUnit": d.data[0].鏃堕棿鍗曚綅, "HUnitTime": d.data[0].杩愯鏃堕棿
- , "HWorkQty": d.data[0].鍔犲伐鏁伴噺, "HPassRate": d.data[0].鑹巼, "HOverRate": d.data[0].瓒呴姣斾緥, "HReadyTime": d.data[0].鍑嗗鏃堕棿, "HQueueTime": d.data[0].鎺掗槦鏃堕棿
- , "HMoveTime": d.data[0].杞Щ鏃堕棿, "HNextProcFlag": d.data[0].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[0].娴佽浆宸ュ簭 == 0 ? false : true, "HSubStdEmpQty": d.data[0].鏍囧噯浜烘暟, "HSubCanUseSourceQty": d.data[0].鍙搷浣滆澶囨暟
- , "HFixPrice": d.data[0].鐝骇瀹氶, "HProcPrice": d.data[0].鍔犲伐鍗曚环, "HBadPrice": d.data[0].涓嶅悎鏍煎崟浠�, "HWasterPrice": d.data[0].鎶ュ簾鍗曚环, "HStdFlag": d.data[0].鏍囧噯瀹氶
- , "HBeginDayQty": d.data[0].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[0].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[0].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[0].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[0].鏈亾鍑嗗鏃堕棿
- , "HICMOReadyTimes": d.data[0].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[0].鑷姩绉昏浆, "HTechnologyParameter": d.data[0].宸ヨ壓鍙傛暟, "HPicNum": d.data[0].鍥剧焊缂栧彿, "HProcCheckNote": d.data[0].鏈伐搴忕‘璁よ褰�
- , "HProcWorkNum": d.data[0].绋嬪簭鍙�
- }];
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push(
+ {
+ "HProcNo": d.data[i].宸ュ簭鍙�, "HProcID_S": d.data[i].宸ユ, "HProcType": d.data[i].宸ュ簭绫诲瀷, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].浜х嚎涓績
+ , "HWorkQty_S": d.data[i].浜х嚎浜ц兘, "HSubStdEmpQty_S": d.data[i].浜х嚎浜烘暟, "HMouldNo": d.data[i].妯″叿缂栧彿, "HChangeMould": d.data[i].鎹㈡ā鏃堕棿, "HPackStd": d.data[i].鍛ㄨ浆绠辨爣鍑�
+ , "HPack": d.data[i].鍛ㄨ浆绠�, "HPutArea": d.data[i].鏆傛斁鍖�, "HMyWorkDays": d.data[i].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[i].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[i].宸ュ簭
+ , "HProcID": d.data[i].hprocid, "宸ヤ綔涓績浠ｇ爜": d.data[i].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[i].HCenterID, "宸ヤ綔涓績": d.data[i].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[i].HSupID
+ , "渚涘簲鍟嗕唬鐮�": d.data[i].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[i].渚涘簲鍟�, "HSupFlag": d.data[i].濮斿鏍囪 == 0 ? false : true, "HTimeUnit": d.data[i].鏃堕棿鍗曚綅, "HUnitTime": d.data[i].杩愯鏃堕棿
+ , "HWorkQty": d.data[i].鍔犲伐鏁伴噺, "HPassRate": d.data[i].鑹巼, "HOverRate": d.data[i].瓒呴姣斾緥, "HReadyTime": d.data[i].鍑嗗鏃堕棿, "HQueueTime": d.data[i].鎺掗槦鏃堕棿
+ , "HMoveTime": d.data[i].杞Щ鏃堕棿, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].娴佽浆宸ュ簭 == 0 ? false : true, "HSubStdEmpQty": d.data[i].鏍囧噯浜烘暟, "HSubCanUseSourceQty": d.data[i].鍙搷浣滆澶囨暟
+ , "HFixPrice": d.data[i].鐝骇瀹氶, "HProcPrice": d.data[i].鍔犲伐鍗曚环, "HBadPrice": d.data[i].涓嶅悎鏍煎崟浠�, "HWasterPrice": d.data[i].鎶ュ簾鍗曚环, "HStdFlag": d.data[i].鏍囧噯瀹氶
+ , "HBeginDayQty": d.data[i].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[i].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[i].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[i].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[i].鏈亾鍑嗗鏃堕棿
+ , "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
+ , "HProcWorkNum": d.data[i].绋嬪簭鍙�
+ }
+ )
+ }
option.data = rowdata;
table.render(option);
-
- if (d.data[0].濮斿鏍囪) {
- $('#HSupFlag1').attr("checked", true);
- }
- if (d.data[0].HNextProcFlag) {
- $('#HNextProcFlag1').attr("checked", true);
- }
- if (d.data[0].娴佽浆宸ュ簭) {
- $('#HFlowProc1').attr("checked", true);
- }
- if (d.data[0].鏍囧噯瀹氶) {
- $('#HStdFlag1').attr("checked", true);
- }
- if (d.data[0].鑷姩绉昏浆) {
- $('#HAutoTrunFlag1').attr("checked", true);
+
+ for (var i = 0; i < d.data.length; i++) {
+ if (d.data[i].濮斿鏍囪) {
+ $('#HSupFlag' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].HNextProcFlag) {
+ $('#HNextProcFlag' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].娴佽浆宸ュ簭) {
+ $('#HFlowProc' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].鏍囧噯瀹氶) {
+ $('#HStdFlag' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].鑷姩绉昏浆) {
+ $('#HAutoTrunFlag' + (i + 1)).attr("checked", true);
+ }
+ $('#HProcType' + (i + 1)).find("option[value='" + d.data[i].宸ュ簭绫诲瀷 + "']").attr("selected", true);
}
form.render('checkbox');
- $('#HProcType1').find("option[value='" + d.data[0].宸ュ簭绫诲瀷+ "']").attr("selected", true);
form.render('select');
}
})
@@ -1429,8 +1436,8 @@
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
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 b042216..9583018 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"
@@ -341,7 +341,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].HItemID;
- var linteridSub = data[0].hsubid;
+ //var linteridSub = data[0].hsubid;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
@@ -349,7 +349,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
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 19e8f57..3d3c02a 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"
@@ -56,29 +56,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- <div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
+ </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="HWorkBillNo" id="HWorkBillNo">
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
- </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="HWorkBillNo" id="HWorkBillNo">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
</div>
</div>
</div>
@@ -207,10 +211,11 @@
$("#SHPrintQty").val("");//鎵撳嵃鐘舵��
$("input[type='checkbox'][name='wybj']").prop('checked', false);
form.render("checkbox");//濮斿鏍囪
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
+ $("#HBillNo").val("");//鍗曟嵁鍙�
//$("#btnSearch").click();
sWhere = "";
get_Display(sWhere);
@@ -225,6 +230,7 @@
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var HWorkBillNo = $("#HWorkBillNo").val();
var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
if (SHPrintQty == "鍏ㄩ儴") {
sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
@@ -254,6 +260,9 @@
if (SHname) {
sWhere += " and 瀛愪欢鍚嶇О like '%" + SHname + "%' or 瀛愪欢瑙勬牸 like '%" + SHname + "%'"
}
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index b7e9ff1..f073b7f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -307,6 +307,7 @@
form.on('submit(cmdQuery)', function () {
var HBillNo = $("#HBillNo").val();
var HSourceBillNo = $("#HSourceBillNo").val();
+ var index = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Gy_Mould/list1',
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 f7e9cf7..c6c2075 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"
@@ -116,7 +116,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">婧愬崟鍗曞彿:</label>
+ <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" disabled="disabled">
<input type="text" class="layui-input" name="HInterID" id="HInterID" disabled="disabled" style="width:100px">
@@ -193,11 +193,11 @@
form.on('submit(btn_Check)', function (data) {//瀹℃牳
var index = layer.load();
var HInterID = $('#HInterID').val();
- var HBillNo = $('#HBarCode').val();
+ var HBillNo = $('#HBillNo').val();
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBill",
type: "Get",
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": "" },
+ data: { "HInterID": HInterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo},
success: function (result) {
if (result.code == "1") {
layer.msg("瀹℃牳鎴愬姛", { icon: 1, btn: ['纭'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -270,15 +270,15 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillCheckDate",
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBill",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBillno": HBarCode },
success: function (result) {
if (result.code == "1") {
var data = result.data[0];
$("#HSupName").val(data.渚涘簲鍟�);
$("#HDeptName").val(data.閮ㄩ棬);
- $("#HBillNo").val(data.婧愬崟鍗曞彿);
+ $("#HBillNo").val(data.鍗曟嵁鍙�);
$("#HInterID").val(data.hmainid);
option.data = result.data;
table.render(option);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 8029a2e..e6251f1 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -207,7 +207,7 @@
</div>
</div>
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+ <button type="button" lay-submit="" class="layui-btn" id="Saver" lay-filter="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
index 490119b..59b067c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
@@ -262,8 +262,16 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1203'
@@ -399,60 +407,60 @@
//鍔犺浇缂撳瓨鍒楄〃鏁版嵁
- //function get_Display() {
- // var ajaxLoad = layer.load();
- // $.ajax({
- // url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
- // type: "GET",
- // data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
- // success: function (data1) {
- // if (data1.count == 1) {
- // var data = [];
- // //缁欑┖鐨勬暟缁勮祴鍊�
- // for (var key in data1.list) {
- // data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- // }
+ function get_Display() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
+ type: "GET",
+ data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
- // for (var i = 0; i < data.length; i++) {
- // if (data[i].name == '鍗曟嵁鍐呯爜' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- // }
- // else {
- // switch (data[i].Type) {
- // //int
- // case 'DateTime':
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- // break;
- // default:
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- // }
- // }
- // }
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == '鍗曟嵁鍐呯爜' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
- // //鍔ㄦ�佹樉绀哄垪鍚�
- // table.render({
- // elem: '#dj-table'
- // , cols: [col]
- // , data: data1.data
- // , height: 550
- // , page: true
- // , cellMinWidth: 90
- // , limit: 50
- // , limits: [50, 500, 5000, 20000]
- // });
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ table.render({
+ elem: '#dj-table'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ });
- // layer.close(ajaxLoad);
- // //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- // } else {
- // layer.close(ajaxLoad);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(ajaxLoad);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- //}
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鍒锋柊鏄庣粏椤电
table.render({
--
Gitblit v1.9.1