From 842c061531c599ae2e3778bf6d572c773a14641b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 03 八月 2022 14:52:19 +0800
Subject: [PATCH] nothing
---
WebTM/App_Data/MssqlReportData.cs | 1
WebTM/views/grf/瑞与祺江苏打印模板.grf | 596 +++++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 83 ++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 164 ++-
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 383 ++++++++++
WebTM/views/index_Mobile.html | 6
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 1
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 24
WebTM/views/Baseset/SRM_OpenTmpList.html | 4
WebTM/views/index.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 24
WebTM/views/组装单/Sc_PCruxBindingPDA.html | 460 +-----------
WebTM/views/Baseset/基础资料/Gy_RoutingBillList.html | 1
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 52 +
WebTM/Vlog/webapi20220730.txt | 87 ++
WebTM/Vlog/webapi20220728.txt | 80 ++
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 1
WebTM/views/生产管理/生产投料单/Sc_PPickingBillList.html | 65 +
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 5
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 10
WebTM/WebTM.csproj | 2
25 files changed, 1,567 insertions(+), 491 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 80d5ea5..7c22561 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -23,6 +23,7 @@
//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=192.168.0.199;Initial Catalog=HX_LMESsys;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 string sServer;
//public string sDataBase;
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index ee6a9ec..3826e37 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -12,16 +12,16 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="bin/layuiadmin/style/login.css">
- <publishTime>08/16/2021 17:24:30</publishTime>
+ <publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>07/18/2022 17:47:07</publishTime>
+ <publishTime>07/31/2022 10:04:38</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>07/18/2022 17:47:07</publishTime>
+ <publishTime>07/31/2022 10:04:38</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>03/14/2022 15:07:22</publishTime>
@@ -660,7 +660,7 @@
<publishTime>12/23/2021 16:07:31</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>07/07/2022 15:47:53</publishTime>
+ <publishTime>07/31/2022 10:15:54</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -780,7 +780,7 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/Baseset/SRM_OpenTmpList.html">
- <publishTime>03/10/2022 14:55:22</publishTime>
+ <publishTime>07/31/2022 10:23:49</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -810,7 +810,7 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html">
- <publishTime>12/23/2021 16:07:32</publishTime>
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -1100,6 +1100,9 @@
<File Include="views/grf/b1.grf">
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
+ <File Include="views/grf/cabinet-CG.grf">
+ <publishTime>07/29/2022 08:27:29</publishTime>
+ </File>
<File Include="views/grf/cabinet-MZJ.grf">
<publishTime>12/24/2021 13:31:52</publishTime>
</File>
@@ -1230,13 +1233,13 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>07/08/2022 18:21:53</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>07/08/2022 16:58:50</publishTime>
+ <publishTime>07/31/2022 09:55:47</publishTime>
</File>
<File Include="views/IpadIndex.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -1530,13 +1533,13 @@
<publishTime>05/16/2022 13:49:35</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
- <publishTime>07/07/2022 17:13:18</publishTime>
+ <publishTime>07/18/2022 18:14:15</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
- <publishTime>07/02/2022 12:19:41</publishTime>
+ <publishTime>07/18/2022 09:26:42</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html">
- <publishTime>07/07/2022 17:12:28</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">
<publishTime>03/10/2022 14:55:22</publishTime>
@@ -1560,10 +1563,10 @@
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">
- <publishTime>07/08/2022 19:43:20</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.html">
- <publishTime>07/02/2022 13:07:47</publishTime>
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryList_WMS.html">
<publishTime>03/10/2022 14:55:22</publishTime>
@@ -1820,6 +1823,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenterDyCol.html">
+ <publishTime>07/27/2022 08:48:15</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html">
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
@@ -1830,7 +1836,7 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>05/30/2022 13:35:03</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">
<publishTime>03/10/2022 14:55:22</publishTime>
@@ -1952,11 +1958,14 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_QK_WLPackingBillList.aspx">
<publishTime>05/12/2022 13:55:39</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_HPPickingBillList.aspx">
+ <publishTime>07/29/2022 08:27:29</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ICMOBillList.aspx">
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList.aspx">
- <publishTime>05/30/2022 13:35:03</publishTime>
+ <publishTime>07/29/2022 13:22:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
<publishTime>03/10/2022 14:55:22</publishTime>
@@ -1998,7 +2007,7 @@
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">
- <publishTime>07/18/2022 17:44:39</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">
<publishTime>04/14/2022 09:22:30</publishTime>
@@ -2013,7 +2022,7 @@
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>05/30/2022 13:35:03</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2028,7 +2037,7 @@
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">
- <publishTime>06/30/2022 10:10:01</publishTime>
+ <publishTime>07/29/2022 08:37:06</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html">
<publishTime>06/30/2022 10:10:01</publishTime>
@@ -2157,7 +2166,7 @@
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html">
- <publishTime>07/05/2022 15:37:55</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/Gy_DuSubsidyItemBillEdit.html">
<publishTime>01/23/2022 20:32:28</publishTime>
@@ -2177,6 +2186,12 @@
<File Include="views/宸ヨ祫绠＄悊/Gy_WorkTypeBillList.html">
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
+ <File Include="views/宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/ReportList.html">
+ <publishTime>07/27/2022 13:31:21</publishTime>
+ </File>
+ <File Include="views/宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/ReportList2.html">
+ <publishTime>07/27/2022 13:31:21</publishTime>
+ </File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 10:40:02</publishTime>
</File>
@@ -2184,10 +2199,10 @@
<publishTime>10/19/2021 09:27:19</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillEdit.html">
- <publishTime>07/07/2022 15:44:24</publishTime>
+ <publishTime>07/07/2022 15:43:14</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillList.html">
- <publishTime>07/07/2022 15:44:24</publishTime>
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 10:40:02</publishTime>
@@ -2246,8 +2261,14 @@
<File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html">
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
+ <File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit_yqn.html">
+ <publishTime>07/27/2022 08:48:15</publishTime>
+ </File>
<File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">
<publishTime>03/10/2022 14:55:22</publishTime>
+ </File>
+ <File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList_yqn.html">
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/鎶ュ伐骞冲彴/ReportPlatform.html">
<publishTime>07/01/2021 13:15:12</publishTime>
@@ -2343,7 +2364,7 @@
<publishTime>04/14/2022 09:22:30</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
- <publishTime>07/14/2022 10:48:23</publishTime>
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
<publishTime>04/14/2022 09:22:30</publishTime>
@@ -2412,7 +2433,7 @@
<publishTime>09/13/2021 10:11:41</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>07/12/2022 09:16:52</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
<publishTime>06/30/2022 10:10:01</publishTime>
@@ -2775,13 +2796,13 @@
<publishTime>03/30/2022 17:30:55</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsList.html">
- <publishTime>04/14/2022 09:22:30</publishTime>
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">
<publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">
- <publishTime>06/30/2022 10:10:01</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">
<publishTime>05/30/2022 13:35:03</publishTime>
@@ -2817,7 +2838,7 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>05/30/2022 17:37:29</publishTime>
+ <publishTime>07/31/2022 15:01:25</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -2835,7 +2856,7 @@
<publishTime>12/29/2021 00:41:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">
- <publishTime>05/30/2022 13:35:03</publishTime>
+ <publishTime>07/27/2022 08:48:15</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html">
<publishTime>04/14/2022 09:22:30</publishTime>
@@ -2876,8 +2897,11 @@
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">
<publishTime>04/14/2022 09:22:30</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">
+ <publishTime>07/31/2022 09:55:47</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html">
- <publishTime>07/07/2022 17:04:05</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">
<publishTime>06/30/2022 10:10:01</publishTime>
@@ -2895,7 +2919,7 @@
<publishTime>03/10/2022 14:55:22</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html">
- <publishTime>07/07/2022 17:06:33</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html">
<publishTime>04/21/2022 13:46:59</publishTime>
@@ -2916,7 +2940,7 @@
<publishTime>03/10/2022 14:58:38</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
- <publishTime>06/30/2022 10:10:01</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
<publishTime>05/30/2022 13:35:03</publishTime>
@@ -2949,7 +2973,7 @@
<publishTime>04/14/2022 09:22:30</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html">
- <publishTime>05/07/2022 15:04:42</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterialDetailList.html">
<publishTime>05/07/2022 15:04:42</publishTime>
@@ -3000,7 +3024,10 @@
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
- <publishTime>02/08/2022 17:01:21</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
+ </File>
+ <File Include="views/缁勮鍗�/Sc_PCruxBindingPDA.html">
+ <publishTime>07/31/2022 09:55:47</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
<publishTime>06/30/2022 10:10:01</publishTime>
@@ -3009,7 +3036,7 @@
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">
- <publishTime>07/14/2022 17:50:28</publishTime>
+ <publishTime>07/29/2022 08:27:29</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>06/30/2022 10:10:01</publishTime>
@@ -3291,10 +3318,10 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
- <publishTime>06/30/2022 10:10:01</publishTime>
+ <publishTime>07/31/2022 12:26:05</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
- <publishTime>06/30/2022 10:10:01</publishTime>
+ <publishTime>07/31/2022 12:36:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/MES_StationOutBill_PDA.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3324,25 +3351,25 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
- <publishTime>07/12/2022 11:19:28</publishTime>
+ <publishTime>07/31/2022 16:34:08</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <publishTime>06/30/2022 10:10:01</publishTime>
+ <publishTime>07/31/2022 12:45:46</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_loser.html">
<publishTime>05/17/2021 19:07:00</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>05/30/2022 14:22:07</publishTime>
+ <publishTime>07/31/2022 12:26:06</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>05/30/2022 16:19:48</publishTime>
+ <publishTime>07/31/2022 12:36:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>05/30/2022 14:22:07</publishTime>
+ <publishTime>07/31/2022 12:26:06</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>05/30/2022 16:19:48</publishTime>
+ <publishTime>07/31/2022 12:36:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3387,7 +3414,7 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>05/30/2022 13:35:03</publishTime>
+ <publishTime>07/31/2022 09:55:47</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
@@ -3413,6 +3440,9 @@
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
+ <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillDyColList.html">
+ <publishTime>07/29/2022 08:27:29</publishTime>
+ </File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
<publishTime>04/14/2022 09:22:30</publishTime>
</File>
@@ -3426,7 +3456,7 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>05/30/2022 13:35:03</publishTime>
+ <publishTime>07/31/2022 09:55:47</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
<publishTime>04/14/2022 09:22:30</publishTime>
@@ -3456,13 +3486,13 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html">
- <publishTime>07/07/2022 17:14:07</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html">
- <publishTime>07/07/2022 17:14:37</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">
- <publishTime>07/02/2022 12:20:12</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">
<publishTime>03/10/2022 14:55:23</publishTime>
@@ -3480,19 +3510,19 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html">
- <publishTime>07/07/2022 17:08:25</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
<publishTime>01/02/2022 22:16:06</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Check.html">
- <publishTime>07/02/2022 13:05:57</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.html">
<publishTime>12/23/2021 16:07:32</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html">
- <publishTime>07/07/2022 15:00:07</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_FastList.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3504,10 +3534,10 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
- <publishTime>07/07/2022 15:44:24</publishTime>
+ <publishTime>07/18/2022 18:14:15</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
- <publishTime>07/02/2022 12:22:47</publishTime>
+ <publishTime>07/18/2022 09:26:42</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillEdit.html">
<publishTime>06/30/2022 10:10:01</publishTime>
@@ -3516,7 +3546,7 @@
<publishTime>06/30/2022 10:10:01</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
- <publishTime>07/07/2022 17:02:07</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_FastList.html">
<publishTime>08/16/2021 17:24:30</publishTime>
@@ -3537,16 +3567,16 @@
<publishTime>05/10/2022 14:18:08</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html">
- <publishTime>07/07/2022 17:02:48</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastCheck.html">
<publishTime>04/28/2022 16:51:10</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html">
- <publishTime>07/02/2022 12:19:19</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html">
- <publishTime>07/07/2022 17:10:37</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBillList.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3558,10 +3588,10 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
- <publishTime>07/07/2022 17:15:10</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html">
- <publishTime>07/02/2022 12:22:01</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Xs_SeOrderPickUp_New.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3579,10 +3609,10 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
- <publishTime>07/07/2022 17:16:53</publishTime>
+ <publishTime>07/18/2022 17:45:10</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">
- <publishTime>07/06/2022 16:02:47</publishTime>
+ <publishTime>07/18/2022 17:46:03</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_CheckList_New.html">
<publishTime>04/08/2022 13:12:51</publishTime>
@@ -3591,13 +3621,13 @@
<publishTime>04/08/2022 13:17:45</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_RedOtherInBill_Fast.html">
- <publishTime>07/07/2022 15:00:03</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
- <publishTime>07/07/2022 17:11:17</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">
<publishTime>03/10/2022 14:55:23</publishTime>
@@ -3609,10 +3639,10 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
- <publishTime>07/07/2022 17:16:43</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html">
- <publishTime>07/02/2022 12:20:45</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/qrscan.js">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3630,10 +3660,10 @@
<publishTime>03/10/2022 14:55:23</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html">
- <publishTime>07/07/2022 17:10:16</publishTime>
+ <publishTime>07/12/2022 11:19:28</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html">
- <publishTime>07/02/2022 12:19:00</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustOutBackBill.html">
<publishTime>12/23/2021 16:07:32</publishTime>
@@ -3642,10 +3672,10 @@
<publishTime>05/07/2022 15:04:43</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
- <publishTime>07/02/2022 12:18:34</publishTime>
+ <publishTime>07/06/2022 10:43:43</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/18/2022 17:47:24</publishTime>
+ <publishTime>07/29/2022 08:37:41</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/Vlog/webapi20220728.txt b/WebTM/Vlog/webapi20220728.txt
index eca565f..bbb3fbc 100644
--- a/WebTM/Vlog/webapi20220728.txt
+++ b/WebTM/Vlog/webapi20220728.txt
@@ -51,3 +51,83 @@
left join gy_unit u on m.HUnitID=u.HItemID
JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/28 15:09:18 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/28 15:09:18 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/28 15:34:01 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163','123775-3196')
+
+2022/7/28 15:34:01 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163','123775-3196')
+
+2022/7/28 15:53:35 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163','123775-3196')
+
+2022/7/28 15:53:35 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163','123775-3196')
+
+2022/7/28 15:53:36 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/28 15:53:36 ReportDataSet:2
+
+2022/7/28 15:53:48 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163','123775-3196')
+
+2022/7/28 15:53:48 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163','123775-3196')
+
+2022/7/28 15:53:48 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/28 15:53:48 ReportDataSet:2
diff --git a/WebTM/Vlog/webapi20220730.txt b/WebTM/Vlog/webapi20220730.txt
new file mode 100644
index 0000000..c5b9534
--- /dev/null
+++ b/WebTM/Vlog/webapi20220730.txt
@@ -0,0 +1,87 @@
+2022/7/30 11:37:30 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 11:37:30 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 11:37:30 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/30 11:37:30 ReportDataSet:1
+
+2022/7/30 11:43:14 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 11:43:14 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 11:43:14 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/30 11:43:14 ReportDataSet:1
+
+2022/7/30 11:44:30 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 11:44:30 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 11:44:30 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/30 11:44:30 ReportDataSet:1
+
+2022/7/30 13:19:22 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 13:19:22 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/30 13:19:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/30 13:19:23 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 69842b0..8529e6f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -215,6 +215,7 @@
<Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
<Content Include="views\grf\宸ュ簭娴佽浆.grf" />
<Content Include="views\grf\cabinet-CG.grf" />
+ <Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -851,6 +852,7 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBill_Add.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Add.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportPODemandPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportPODemandPlanBillList_S.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportWorkDemandPlanBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 87674ea..c147982 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index f445970..cfd9d8f 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -18,8 +18,8 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-btn-group">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
index ee43c5f..51bf9cb 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
@@ -83,6 +83,7 @@
{ type: 'radio' }
, { field: 'hmainid', title: '宸ヨ壓璺嚎ID', hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓璺嚎鍚嶇О' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
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"
new file mode 100644
index 0000000..6ca3e1b
--- /dev/null
+++ "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"
@@ -0,0 +1,596 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Height=29.7
+ LeftMargin=0.4
+ TopMargin=0.5
+ RightMargin=0.5
+ BottomMargin=0.5
+ End
+ Object DetailGrid
+ CenterView=T
+ AppendBlankRow=T
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='璁″垝寮�宸ユ棩鏈�'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='璁″垝瀹屽伐鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='妯″叿缂栧彿'
+ End
+ Item
+ Name='PO'
+ End
+ Item
+ Name='娴佹按鍙�'
+ Type=Integer
+ 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='宸ュ簭鍙�'
+ Width=1.34938
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ Width=1.53458
+ End
+ Item
+ Name='Column1'
+ Width=3.06917
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ Width=1.61396
+ End
+ Item
+ Name='鏀舵枡浠撳簱'
+ Width=1.79917
+ End
+ Item
+ Name='鎵瑰彿'
+ Width=1.53458
+ End
+ Item
+ Name='澶囨敞'
+ Width=1.5875
+ End
+ Item
+ Name='Column2'
+ Width=1.61396
+ End
+ Item
+ Name='Column3'
+ Width=1.66688
+ End
+ Item
+ Name='Column4'
+ Width=1.98438
+ End
+ Item
+ Name='Column5'
+ Width=1.69333
+ End
+ End
+ Object ColumnContent
+ Height=1.40229
+ RowsPerPage=16
+ Items ColumnContentCell
+ Item
+ Column='宸ュ簭鍙�'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='娴佹按鍙�'
+ End
+ Item
+ Column='鐗╂枡鍚嶇О'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Dock=Fill
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='瑙勬牸鍨嬪彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='鏀舵枡浠撳簱'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='鎵瑰彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='澶囨敞'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='Column2'
+ End
+ Item
+ Column='Column3'
+ End
+ Item
+ Column='Column4'
+ End
+ Item
+ Column='Column5'
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.00542
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='宸ュ簭鍙�'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='鐗╂枡鍚嶇О'
+ 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='瑙勬牸鍨嬪彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏃ユ湡'
+ End
+ Item
+ GroupTitle=F
+ Column='鏀舵枡浠撳簱'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鎿嶄綔宸�'
+ End
+ Item
+ GroupTitle=F
+ Column='鎵瑰彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='棰嗘枡'
+ End
+ Item
+ GroupTitle=F
+ Column='澶囨敞'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鍚堟牸'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ TextAlign=MiddleCenter
+ Text='杩斾慨'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ TextAlign=MiddleCenter
+ Text='鎶ュ簾'
+ End
+ Item
+ GroupTitle=F
+ Column='Column4'
+ TextAlign=MiddleCenter
+ Text='妫�楠�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column5'
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ End
+ End
+ End
+ End
+ Items Parameter
+ Item
+ Name='Parameter1'
+ End
+ Item
+ Name='Parameter2'
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=4.39208
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.185208
+ Top=0.238125
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=9
+ Items FreeGridColumn
+ Item[1]
+ Width=2.06375
+ End
+ Item[2]
+ Width=2.01083
+ End
+ Item[3]
+ Width=1.82563
+ End
+ Item[6]
+ Width=1.66688
+ End
+ Item[7]
+ Width=1.24354
+ End
+ Item[8]
+ Width=1.24354
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=1.69333
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=5.21229
+ Width=3.175
+ Height=1.5875
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.9965
+ Top=0.211667
+ Width=4.39208
+ Height=1.19063
+ ShrinkFontToFit=T
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=0.211667
+ Top=0.211667
+ Width=4.39208
+ Height=1.19063
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐟炰笌绁虹儹浜ゆ崲鍣ㄧ鎶�锛堟睙鑻忥級\r\n宸ヨ壓娴佽浆鍗�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox2'
+ Left=12.991
+ Top=0.211667
+ Width=0.820208
+ Height=1.19063
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ Text='ID'
+ End
+ End
+ ColSpan=9
+ End
+ Item[2,1]
+ Text='鐗╂枡鍚嶇О锛�'
+ End
+ Item[2,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Dock=Fill
+ DataField='浜у搧鍚嶇О'
+ End
+ End
+ ColSpan=3
+ End
+ Item[2,5]
+ Text='鐗╂枡浠ｇ爜锛�'
+ End
+ Item[2,6]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Dock=Fill
+ DataField='浜у搧浠ｇ爜'
+ End
+ End
+ ColSpan=4
+ End
+ Item[3,1]
+ Text='瑙勬牸鍨嬪彿锛�'
+ End
+ Item[3,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Dock=Fill
+ DataField='瀛愪欢瑙勬牸'
+ End
+ End
+ ColSpan=4
+ End
+ Item[3,6]
+ Text='涓嬭揪鏃ユ湡'
+ End
+ Item[3,7]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Dock=Fill
+ DataField='鏃ユ湡'
+ End
+ End
+ ColSpan=3
+ End
+ Item[4,1]
+ Text='閿�鍞鍗曞彿锛�'
+ End
+ Item[4,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Dock=Fill
+ DataField='閿�鍞鍗曞彿'
+ End
+ End
+ ColSpan=3
+ End
+ Item[4,5]
+ Text='鐢熶骇璁㈠崟鍙�'
+ End
+ Item[4,6]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Dock=Fill
+ DataField='浠诲姟鍗曞彿'
+ End
+ End
+ ColSpan=4
+ End
+ Item[5,1]
+ Text='鍖呰瑕佹眰'
+ End
+ Item[5,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Dock=Fill
+ DataField='鍖呰鏍囪瘑'
+ End
+ End
+ ColSpan=4
+ End
+ Item[5,6]
+ Text='鍖呰瑕佹眰缂栫爜'
+ ColSpan=2
+ End
+ Item[5,8]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Dock=Fill
+ DataField='鍖呰鏍囪瘑缂栫爜'
+ End
+ End
+ ColSpan=2
+ End
+ End
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 5d705b3..ae67d15 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -421,6 +421,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index e5af90f..7fab2c8 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -138,7 +138,7 @@
</a>
</dd>
<dd>
- <a lay-href="鐢熶骇绠＄悊/缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
+ <a lay-href="缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
浜х嚎鍏抽敭浠剁粦瀹�
</a>
@@ -438,7 +438,7 @@
</dl>
</li>
<!-- 璁惧绠＄悊 -->
- <!--<li data-name="set" class="layui-nav-item">
+ <li data-name="set" class="layui-nav-item">
<a style="padding-left:20px;">
<img src="../layuiadmin/myicon/杞﹂棿绠＄悊.svg" alt="杞﹂棿绠＄悊" style="width:25px;height:25px;margin-right: 5px;" />
<cite>璁惧绠＄悊</cite>
@@ -469,7 +469,7 @@
</a>
</dd>
</dl>
- </li>-->
+ </li>
<!-- 缂撳瓨鍒楄〃 -->
<li data-name="set" class="layui-nav-item">
<a style="padding-left:20px;">
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 87ed785..7506e33 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.宸ヨ壓鍙傛暟 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.鍖呰鏍囪瘑缂栫爜 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/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 9685919..d8f5c28 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -836,7 +836,7 @@
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
async: false,
success: function (datas) {
- var LoadData = datas.data.Sc_ProcessReportSub;
+ var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
var HQty = LoadData[0].HQty;
var HBadQty = LoadData[0].HBadQty;
var HWasterQty = LoadData[0].HWasterQty;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
new file mode 100644
index 0000000..fcb4ab9
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -0,0 +1,383 @@
+锘�<!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 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; width: 185px;">
+ <select name="HORGID" id="HORGID" lay-verify="HORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" 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: 10px 0 10px;">
+ <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="HSCZYID" name="HSCZYID" id="HSCZYID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HSCZYName" name="HSCZYName" id="HSCZYName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSCZYID" id="btnHSCZYID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">闇�姹傚崟鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HXQD" id="HXQD">
+ </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="HMOBILLNO" id="HMOBILLNO">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ 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(btnHMATERIALID)', function (data) {
+ btnHMATERIALID();
+ });
+ //#endregion
+
+ //#region 鐢熶骇杞﹂棿
+ form.on('submit(btnHDeptID)', function (data) {
+ btnHDeptID();
+ });
+ //#endregion
+
+ //#region 鐢熶骇璧勬簮
+ form.on('submit(btnHSCZYID)', function (data) {
+ btnHSCZYID();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鐢熶骇缁勭粐鍔犺浇
+ Organ();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //蹇�熻繃婊�
+ get_FastQuery(1);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О' }
+ , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', width: 100 }
+ , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
+ , { field: 'FCOLUMN9', title: '鐢靛帇/鍔熺巼/搴曟澘' }
+ , { field: '璁㈠崟浜ゆ湡', title: '璁㈠崟浜ゆ湡', templet: "<div>{{d.璁㈠崟浜ゆ湡 ==null ?'':layui.util.toDateString(d.璁㈠崟浜ゆ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '浜у搧缂栫爜', title: '浜у搧缂栫爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿' }
+ , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�', templet: "<div>{{d.鏃ヨ鍒掓棩鏈� ==null ?'':layui.util.toDateString(d.鏃ヨ鍒掓棩鏈�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鏃ヨ鍒掓暟閲�', title: '鏃ヨ鍒掓暟閲�' }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿' }
+ , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺' }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+ , { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺' }
+ , { field: '鍙敤鏁伴噺', title: '鍙敤鏁伴噺' }
+ , { field: '鍗虫椂搴撳瓨鏁伴噺', title: '鍗虫椂搴撳瓨鏁伴噺' }
+ , { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺' }
+ , { field: '棰嗙敤鍗犵敤鏁伴噺', title: '棰嗙敤鍗犵敤鏁伴噺' }
+ , { field: '鏈夋棤閲囪喘璁㈠崟', title: '鏈夋棤閲囪喘璁㈠崟' }
+ ]]
+ };
+ }
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.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>';
+ }
+ $("#HORGID").append(Organization);
+ $("#HORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
+ 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);
+ } 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(number) {
+ var HORGID = "";
+ if (number == 1) {
+ HORGID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HORGID = $("#HORGID").val();//缁勭粐
+ }
+ var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
+ var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
+ var HSCZYID = $("#HSCZYID").val();//鐢熶骇璧勬簮
+ var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
+ var HMOBILLNO = $("#HMOBILLNO").val();//鐢熶骇璁㈠崟鍙�
+ sWhere = {
+ HORGID: HORGID
+ , HMATERIALID: HMATERIALID
+ , HDeptID: HDeptID
+ , HSCZYID: HSCZYID
+ , HXQD: HXQD
+ , HMOBILLNO: HMOBILLNO
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
+ $("#HMATERIALID").val(0);//鐗╂枡/浜у搧
+ $("#HMATERIALNAME").val("");
+ $("#HDeptID").val(0);//鐢熶骇杞﹂棿
+ $("#DeptNAME").val("");
+ $("#HSCZYID").val(0);//鐢熶骇璧勬簮
+ $("#HSCZYName").val("");
+ $("#HXQD").val("");//闇�姹傚崟鍙�
+ $("#HMOBILLNO").val("");//鐢熶骇璁㈠崟鍙�
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鐗╂枡鍒楄〃
+ function btnHMATERIALID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMATERIALID").val(checkStatus.data[0].HItemID);
+ $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇杞﹂棿
+ function btnHDeptID() {
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#DeptNAME").val(checkStatus.data[0].HName);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇璧勬簮
+ function btnHSCZYID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSCZYID").val(checkStatus.data[0].HItemID);
+ $("#HSCZYName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index 431f4cc..64c9edb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -11,7 +11,6 @@
<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">
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 cbe28d0..1acef17 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"
@@ -149,7 +149,7 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
//鑾峰彇杞﹂棿鍒�
- var HDeptName = '<option value="0" style="color:red;">鍏ㄩ儴杞﹂棿</option>';
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
@@ -158,7 +158,7 @@
var data = result.data;
for (var i = 0; i < data.length; i++) {
if (i == 0)
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" selected>' + data[i].HName + '</option>';
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
else
HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
@@ -417,7 +417,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
@@ -456,8 +456,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#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("");//璁㈠崟璺熻釜鍙�
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HDeptName").val("");//鍗曟嵁鍙�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html"
index abe5157..8cfa44b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPickingBillList.html"
@@ -43,6 +43,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鐢ㄦ枡鍗�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HPPomBillNo" id="HPPomBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鍗�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏉＄爜鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HBillCode" id="HBillCode" style="width:190px;">
@@ -116,6 +128,9 @@
case 'btn-print':
get_PrintReport();
break;
+ case 'btn-view':
+ get_PrintView();
+ break;
default:
break;
}
@@ -146,8 +161,8 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type:"checkbox",fixed:"left" }
- , { field: 'HInterID', title: 'HInterID', sort: true }
- , { field: 'HEntryID', title: 'HEntryID', sort: true }
+ , { field: 'HInterID', title: 'HInterID', sort: true, hide: true}
+ , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鏉″舰鐮�', title: '鏉″舰鐮�', width: 150 }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -158,6 +173,7 @@
, { field: '浠舵暟', title: '浠舵暟' }
, { field: '棰嗘枡鍗曞彿', title: '棰嗘枡鍗曞彿' }
, { field: '鐢ㄦ枡娓呭崟鍙�', title: '鐢ㄦ枡娓呭崟鍙�' }
+ , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
]]
};
option.data = [];
@@ -167,6 +183,14 @@
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sc_PckSplit/Get_PPickingBillList',
@@ -186,6 +210,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ sWhere = "";
}
// 蹇�熻繃婊�
@@ -194,6 +219,8 @@
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
var HBillCode = $("#HBillCode").val();//鍒跺崟浜�
+ var HPPomBillNo = $("#HPPomBillNo").val();//鍒跺崟浜�
+ var HICMOBillNo = $("#HICMOBillNo").val();//鍒跺崟浜�
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
@@ -207,6 +234,12 @@
if (HBillCode) {
sWhere += " and 鏉″舰鐮� like '%" + HBillCode + "%'";
}
+ if (HPPomBillNo) {
+ sWhere += " and 鐢ㄦ枡娓呭崟鍙� like '%" + HPPomBillNo + "%'";
+ }
+ if (HICMOBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -217,6 +250,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#HBillCode").val("");//閮ㄩ棬
+ $("#HPPomBillNo").val("");//閮ㄩ棬
+ $("#HICMOBillNo").val("");//閮ㄩ棬
sWhere = "";
}
@@ -246,7 +281,31 @@
layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹墦鍗帮紒');
}
}
-
+ //棰勮
+ function get_PrintView() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var PrintIds = "";
+ if (checkStatus.data.length >= 1) {
+ for (var i = 0; i < data.length; i++) {
+ PrintIds += data[i].HInterID + "-" + data[i].HEntryID + ","
+ }
+ PrintIds = PrintIds.substring(0, PrintIds.length - 1);
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + data[0].HInterID.toString() + '&Type=HPPickingBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index c82f50a..a455206 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -213,6 +213,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'HinterId', title: 'HinterId', hide: true }
, { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+ , { field: '鏃ヨ鍒掑伐鍗曞彿', title: '鏃ヨ鍒掑伐鍗曞彿' }
, { field: '鏃ヨ鍒掕鍗曞瓙鍐呯爜', title: '鏃ヨ鍒掕鍗曞瓙鍐呯爜', hide: true }
, { field: '鏃ヨ鍒掕鍗曚富鍐呯爜', title: '鏃ヨ鍒掕鍗曚富鍐呯爜', hide: true }
, { field: '涓荤敓浜ц鍗曞瓙鍐呯爜', title: '涓荤敓浜ц鍗曞瓙鍐呯爜', hide: true }
diff --git "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
index 2f33e5b..d965491 100644
--- "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
+++ "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
@@ -100,7 +100,7 @@
</div>
<div class="layui-col-xs6">
<input type="text" name="HSCZY" id="HSCZY" lay-verify="HSCZY" autocomplete="off" class="layui-input">
- <input type="hidden" name="HSCZYID" id="HSCZY" lay-verify="HSCZYID" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HSCZYID" id="HSCZYID" lay-verify="HSCZYID" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -159,6 +159,7 @@
<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>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -179,11 +180,12 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇宸ュ簭 鐢熶骇璧勬簮銆佹搷浣滃憳銆佺敓浜х彮缁勶級 new
//宸ュ簭
- $("#HProcID").val(sessionStorage["HProcNo"]);
+
+ $("#HProcID").val(sessionStorage["HProcID"]);
$("#HProc").val(sessionStorage["HProc"]);
//鐢熶骇璧勬簮
$("#HSCZY").val(sessionStorage["HSource"]);
- $("#HSCZYID").val(sessionStorage["HSourceID"]);
+ $("#HSCZYID").val(sessionStorage["HSourceID"] == undefined ? "0" : sessionStorage["HSourceID"]);
//鎿嶄綔鍛�
$("#HKeeperName").val(sessionStorage["HKeeper"]);
$("#HKeeperID").val(sessionStorage["HKeeperID"]);
@@ -234,14 +236,14 @@
set_InitGridTM();
//閫夋嫨宸ュ簭
- form.on('submit(HKeeperID-BT)', function () {
+ form.on('submit(HProcID-BT)', function () {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -249,8 +251,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HKeeperName").val(checkStatus.data[0].HName);
- $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ $("#HProc").val(checkStatus.data[0].宸ュ簭);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -264,7 +266,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/UserInformation.html', 'yes']
+ , content: ['../PublicPage/UserInformation.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -287,7 +289,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/GroupInformation.html', 'yes']
+ , content: ['../PublicPage/GroupInformation.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -306,60 +308,32 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
sessionStorage["SourceFlag"] = false;
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , yes: function (index, layero) {
+ Pub_Close(2);
+ }
});
})
//鍒犻櫎
form.on('submit(cmdDelete)', function () {
- var checkStatus = table.checkStatus('wl-table')
+ var checkStatus = table.checkStatus('tm-table')
, data = checkStatus.data;
- // console.log(data);
var sInterID = $('#HInterID').val()
var sMaterID = data[0].HMaterID
- var sBillType = '1201'
- var sAuxPropID = data[0].HAuxPropID
- //var sMTONo = data[0].HMTONo
- var sMTONo = ''
- var sSourceInterID = data[0].HSourceInterID
- var sSourceEntryID = data[0].HSourceEntryID
- var sMouldManagerCtl = 'N'
- var sFIFOCtl = 'N'
+ var sBarCode = data[0].HPJM.toString();
$.ajax(
{
type: "Get",
- //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
+ url: GetWEBURL() + "/Sc_PckSplit/Delete_PHPCruxBillListByME",
async: true,
- data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode},
dataType: "json",
success: function (data) {
if (data.count == 1) {
- $.ajax({
- url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.list.length; i++) {
- count += result.data.list[i].HQty;
- count1 += result.data.list[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ option1.data = data.data;
+ table1.render(option1);
}
else {
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -373,45 +347,24 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- if ($("#HExplanation").val() == "") {
- if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
- $("#HWHNAME").val("");
- $("#HWHID").val("");
- layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- }
var sMainStr = JSON.stringify(data.field);
- var sSubStr = table.cache['wl-table'];
- var sSourceType = $("#HBillType").val();
- if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
- {
- layer.load(3);
- $.ajax(
+ var sSubStr = JSON.stringify(table.cache['pj-table']);
+ var sSubStr1 = JSON.stringify(table.cache['tm-table']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ';' + sessionStorage["HUserName"];
+ $.ajax(
{
type: "POST",
- //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
+ url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
async: true,
- data: { "oMain": sMainStr },
+ data: { "msg": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- sessionStorage["SourceFlag"] = false;
- layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
- icon: 1,
- skin: 'layui-layer-lan',
- closeBtn: 0,
- btn: ['纭'],
- btn2: function () {
- //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- //window.location.reload();//鏂板
- parent.location.href = "../../../views/index.html"
- }//鍏抽棴
- }
- , function () { parent.location.href = "../../../views/index.html"; }//鏂板
- );
+ layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
+ location.reload();
+ });
+ //layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //location.reload();
}
else {
//layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
@@ -425,8 +378,6 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- return false;
- }
});
//鐩戝惉鎻愪氦
@@ -444,23 +395,28 @@
//SN鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var sBarCode = $('#HBarCode').val()
+ var sProcID = $('#HProcID').val()
+ var sInterID = $('#HInterID').val()
+ var sBillNo = $('#HBillNo').val()
if (sBarCode == "") {
layer.msg("璇疯緭鍏N鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
+ if (sProcID == "" || sProcID == "undefined") {
+ sProcID = 0;
+ }
if (event.keyCode == 13) {
$.ajax({
- url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
+ url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxSNBillList",
type: "GET",
async: false,
- data: { "HBarCode": sBarCode },
+ data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo},
success: function (result) {
if (result.count == 1) {
option.data = result.data;
table.render(option);
}
else {
- playSound();
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
layer.closeAll("loading");
@@ -470,281 +426,39 @@
$("#HPCrux").focus();
}
});
-
-
//鍏抽敭浠跺洖杞︽柟娉�
$('#HPCrux').on('keydown', function (event) {
- if (event.keyCode == 13) {
- GetMeesageBySourceBillNo();
- }
- });
-
-
- //鎵潯鐮�
- function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
- var sSubStr = table.cache['wl-table'];
- var sBarCode = $('#HBarCode').val()
- var sInterID = $("#HInterID").val()
- var sBillNo = $("#HBillNo").val()
- var sQty = $("#HQty").val()
- var sHBillType = $("#HBillType").val() //婧愬崟绫诲瀷
- var sBillType = '1201'
- var sHWHID = $("#HWHID").val()
- var sHSPID = $("#HStockPlaceID").val()
- var sSourceBillNo = $("#HSourceBillNo").val()
- var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
- var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
-
- if (sQty == "") {
- sQty = 0;
- }
-
- //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
- if (sBarCode == '') {
- playSound();
- layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ var sHPCrux = $('#HPCrux').val()
+ var sInterID = $('#HInterID').val()
+ var sBillNo = $('#HBillNo').val()
+ if (sHPCrux == "") {
+ layer.msg("璇疯緭鍏ュ叧閿爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (sBarCode != "") {
- $('#HBarCode').val("");
- }
- if (sQty != "") {
- $('#HQty').val("");
- }
- if (sHWHID == "184154") {
- if (sHSPID == "0") {
- playSound();
- layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- $.ajax({
- url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
- type: "GET",
- async: false,
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) {
- playSound1();
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
- $("#HStockPlaceName").val("");
- $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
- element.tabChange('tab-POStockInBill', '2'); //璺宠浆椤电
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
+ type: "GET",
+ async: false,
+ data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo},
+ success: function (result) {
+ if (result.count == 1) {
+ option1.data = result.data;
+ table1.render(option1);
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
- $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
- element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
- }
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
- element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
- }
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField)
- sessionStorage["SourceFlag"] = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1102") {
- $("#HBillType").val("1102");
-
- }
- else if (result.data.HSourceBillType == "1103") {
- $("#HBillType").val("1103");
- }
- else {
- $("#HBillType").val("鎵嬪伐褰曞叆");
- }
- $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
- element.tabChange('tab-POStockInBill', '3');
+ else if (result.count == 2) {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
else {
- if (HSourceFlag == true) {
- element.tabChange('tab-POStockInBill', '3');
- }
- else {
- $("#HSupName").val(result.data.hSupNameField);
- $("#HSupID").val(result.data.hSupIDField);
- //$("#HDeptName").val(result.data.HDept);
- //$("#HDeptID").val(result.data.HDeptID);
- //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- //$("#HBillType").val(result.data.hSourceBillTypeField)
- HSourceFlag = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.hSourceBillTypeField == "1102") {
- $("#HBillType").empty();
- $("#HBillType").val("1102");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '閲囪喘璁㈠崟' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
- }
- if (result.data.hSourceBillTypeField == "1103") {
- $("#HBillType").empty();
- $("#HBillType").val("1103");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鏀舵枡閫氱煡鍗�' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
- }
- else {
- //$("#HBillType").val("-1");
- }
- $("#HSourceBillNo").attr("readonly", "readonly");
- $("#HNote").val(";鐗╂枡鏉＄爜");
- element.tabChange('tab-POStockInBill', '3');
- }
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
-
- layer.load(3)
- $.ajax({
- url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- $("#HBarCode_B").val(result.data.list2[0].HBarCode);
- $("#HMaterName_B").val(result.data.list2[0].HMaterName);
- $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
- $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
- $("#HUnitName_B").val(result.data.list2[0].HUnitName);
- $("#HQty_B").val(result.data.list2[0].HQty);
- $("#HTMQty_B").val(result.data.list2[0].HTMQty);
- $("#HWHName_B").val(result.data.list2[0].HWHName);
- $("#HSPName_B").val(result.data.list2[0].HSPName);
-
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.list.length; i++) {
- count += result.data.list[i].HQty;
- count1 += result.data.list[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ layer.closeAll("loading");
}
- else {
- playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- layer.closeAll("loading");
- }
- });
- }
- var listOption = {
- elem: '#wl-table'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true}
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
+ });
+ //鏄剧ず瀹屽悗锛屽厜鏍囧埌鍏抽敭浠朵笂
+ $("#HPCrux").focus();
}
- }
- function playSound() {
- var audio = document.getElementById("cs");
- audio.play();
- }
- function playSound1() {
- var audio = document.getElementById("cs2");
- audio.play();
- }
- //鎵簮鍗�
- function GetMeesageBySourceBillNo(obj) {
- var HSourceBillNo = $('#HSourceBillNo').val()
- var sInterID = $("#HInterID").val()
- var sBillNo = $("#HBillNo").val()
- var HSourceBillType = $("#HBillType").val()
- if (HSourceBillNo == "" || sInterID <= 0) {
- layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- //
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
- url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
- type: "GET",
- data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HSupID").val(result.data[0].HSupID);
- $("#HSupName").val(result.data[0].HSupName);
- sessionStorage["SourceFlag"] = true;
- layer.load(3);
- element.tabChange('tab-POStockInBill', '2');
-
- table.render({
- elem: '#wl-table'
- , cellMinWidth: 80
- , totalRow: true
- //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
- //, toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100, totalRow: true}
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100, totalRow: true}
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
- , { field: 'HBatchNo', title: '鎵规' }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
- }
- 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");
- }
- });
- }
+ });
//鍒濆鍖栬〃鏍尖�旈厤浠�
@@ -775,6 +489,7 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 150, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 150, hide: true }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 150 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 150 }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 150 }
@@ -792,50 +507,7 @@
option1.data = [];
table1.render(option1);
}
- //闈炵┖楠岃瘉
- function AllowLoadData(sSubStr, bnt) {
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr) == "undefined") {
- //layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (bnt == 'Saver') {
- if (!typeof (sSubStr) == "undefined") {
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
- }
- }
- if (s == 0) {
- layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- }
- else {
- return true;
- }
- }
+
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 4460179..11d6277 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -527,6 +527,20 @@
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
+ } else if (params[params[0]] == 2) { //宸ュ簭鍑虹珯姹囨姤鍗�
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HBillNo = params[params[1]];//婧愬崟鍗曞彿
+ var HProcNo = params[params[2]];//娴佹按鍙�
+
+ var HBarCode = HBillNo;//鏉″舰鐮�
+ var sProcNo = HProcNo;//娴佹按鍙�
+
+ if (HBarCode != "undefined" && sProcNo != "undefined") {
+ $("#HBarCode").val(HBarCode);
+ $('#HProcNo').val(sProcNo);
+ txtHBarCode_KeyDown(HBarCode);
+ txtHProcNo_KeyDown(HBarCode, sProcNo);
+ }
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
@@ -537,7 +551,7 @@
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
//鍒ゆ柇鏄惁鏂板
- if (OperationType == 1) {
+ if (OperationType == 1 || OperationType==2) {
$("#HInterID").val("");
$("#HBillNo").val("");
//鑾峰彇鏈�澶у崟鎹彿
@@ -780,6 +794,9 @@
} else if (OperationType == 4) {
Pub_Close(1);
}
+ else if (OperationType == 2) {
+ Pub_Close(1);
+ }
});
})
@@ -800,6 +817,11 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+
+ $("#HPlanQty").attr("disabled", "true");
+ $("#HQty").attr("disabled", "true");
+ $("#HWasterQty").attr("disabled", "true");
+ $("#HWorkTimes").attr("disabled", "true");
if (result.Verify == "Y") {
location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
} else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 564537e..b5d581b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -203,6 +203,7 @@
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
, { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺' }
, { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺' }
, {
@@ -223,7 +224,6 @@
, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
, { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
, { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
- , { field: '鎺ユ敹鏁伴噺', title: '鍑虹珯鏁伴噺' }
]]
, text: {
none: '鏃犳暟鎹紒'
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 7a1df58..40b274f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -56,6 +56,7 @@
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -638,6 +639,7 @@
var option;
var btnHMaterID = "";
var HModName = "Sc_ProcessExchangeBill";
+ var HLZQty = 0;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -1098,6 +1100,49 @@
})
});
+ //鎵撳嵃
+ form.on('submit(btn_print)', function () {//浜у搧
+
+ var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and 鍗曟嵁鍙�='" + $("#HBillNo").val() + "' ";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var hinterid = "";
+ if (data1.data.length != 0) {
+ hinterid = data1.data[0]["hmainid"];
+ }
+ layer.close(ajaxLoad);
+
+ if (hinterid != "") {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hinterid + '&MyMsg=' + hinterid + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ } else {
+ layer.msg("璇峰厛淇濆瓨,鍦ㄨ繘琛屾墦鍗�!");
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ });
+
//閫夋嫨瀛愪欢寮圭獥PartInformation.html
form.on('submit(btnSearchMater)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1342,7 +1387,7 @@
"HCenterID": data[i].HCenterID, "HCenterNumber": data[i].宸ヤ綔涓績浠ｇ爜, "HCenterName": data[i].宸ヤ綔涓績鍚嶇О,
"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
"HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "isEntrust": data[i].濮斿鏍囪 == 0 ? "false" : "true",
- "HQty": data[i].鍔犲伐鏁伴噺, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
});
@@ -1728,6 +1773,8 @@
});
}
+
+
//杩斿洖鐢熶骇浠诲姟鍗�
function GetICMOBillValue(hmainid, HEntryID) {
@@ -1787,8 +1834,9 @@
async: true,
data: { "sWhere": "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
success: function (result) {
- if (result.data != null) {
+ if (result.data.length != 0) {
var hbillno = result.data[0].鍗曟嵁鍙�
+ HLZQty = data.娴佽浆鍗℃暟閲�;
getRoutingBill(hbillno);
}
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 9eb234f..19e8f57 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"
@@ -75,6 +75,12 @@
<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>
</div>
@@ -89,6 +95,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
</div>
</script>
</form>
@@ -122,6 +130,7 @@
var sWhere = "";
var option = "";
var option2 = "";
+ var HBillNo = "";
var wybj = false;
//#endregion
@@ -155,6 +164,12 @@
break;
//鎵撳嵃
case 'btn_print': get_print();
+ break;
+ //宸ュ簭鍑虹珯姹囨姤鍗�
+ case 'set_StationOut': set_StationOut();
+ break;
+ //宸ュ簭杩涚珯鎺ユ敹鍗�
+ case 'get_StationIn': get_StationIn();
break;
};
});
@@ -208,6 +223,7 @@
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
+ var HWorkBillNo = $("#HWorkBillNo").val();
var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
if (SHPrintQty == "鍏ㄩ儴") {
@@ -228,6 +244,9 @@
}
if (HDate1) {
sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗曞彿 like '%" + HWorkBillNo + "%'";
}
if (HOrderProcNO) {
sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
@@ -250,6 +269,7 @@
//鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ HBillNo = datas["鍗曟嵁鍙�"].toString();
var HMainID = datas.hmainid;
var wait = layer.load();
$.ajax({
@@ -342,6 +362,9 @@
, { field: 'HBillType', title: 'HBillType', width: 80, hide: true}
, { field: 'hsubid', title: 'hsubid', width: 80, hide: true}
, { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
+ , { field: '婧愬崟瀹㈡埛缂栫爜', title: '婧愬崟瀹㈡埛缂栫爜', width: 80 }
+ , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 80 }
+ , { field: '鍖呰鏍囪瘑缂栫爜', title: '鍖呰鏍囪瘑缂栫爜', width: 80 }
]]
};
table.render(option);
@@ -357,13 +380,13 @@
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: [[
-
- { field: 'hsubid', title: 'hsubid', hide: true}
- ,{ field: '娴佹按鍙�', title: '娴佹按鍙�' }
- , { field: 'HProcID', title: 'HProcID', hide: true}
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width:100 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
, { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
, { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
, { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
@@ -555,6 +578,56 @@
}
}
+ //宸ュ簭鍑虹珯姹囨姤鍗�
+ function set_StationOut() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (data.length === 1) {
+ var HProcNo = data[0].娴佹按鍙�.toString();
+
+ if (HProcNo == "9999") {
+ return layer.msg("娴佹按鍙蜂笉鑳戒负杞伐搴忔祦姘村彿,璇烽噸鏂伴�夋嫨!");
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
+ })
+ }
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+
+ //宸ュ簭杩涚珯鎺ユ敹鍗�
+ function get_StationIn() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (data.length === 1) {
+ var HProcNo = data[0].娴佹按鍙�.toString();
+
+ if (HProcNo == "9999") {
+ return layer.msg("娴佹按鍙蜂笉鑳戒负杞伐搴忔祦姘村彿,璇烽噸鏂伴�夋嫨!");
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
+ })
+ }
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 3d9d3fd..645dcb8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -405,7 +405,21 @@
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
- } else {
+ } else if (params[params[0]] == 2) { //宸ュ簭杩涚珯鎺ユ敹鍗�
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HBillNo = params[params[1]];//婧愬崟鍗曞彿
+ var HProcNo = params[params[2]];//娴佹按鍙�
+
+ var HBarCode = HBillNo;//鏉″舰鐮�
+ var sProcNo = HProcNo;//娴佹按鍙�
+
+ if (HBarCode != "undefined" && sProcNo != "undefined") {
+ $("#HBarCode").val(HBarCode);
+ $('#HProcNo').val(sProcNo);
+ txtHBarCode_KeyDown(HBarCode);
+ txtHProcNo_KeyDown(HBarCode, sProcNo);
+ }
+ } else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
@@ -414,7 +428,7 @@
}
//鍒ゆ柇鏄惁鏂板
- if (OperationType == 1) {
+ if (OperationType == 1 || OperationType == 2) {
//鑾峰彇鏈�澶у崟鎹彿
var ajaxLoad = layer.load();
$.ajax({
@@ -457,6 +471,8 @@
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
+
+
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 鏂板鎸夐挳
@@ -496,6 +512,8 @@
if (result.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+
+ $("#HQty").attr("disabled", "true");
if (result.Verify == "Y") {
location.replace('Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
} else {
@@ -525,6 +543,8 @@
Pub_Close(1);
} else if (OperationType == 4) {
Pub_Close(1);
+ } else if (OperationType == 2) {
+ Pub_Close(1);
}
});
})
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 9a858f9..e8cd148 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -289,7 +289,8 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
, { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
@@ -305,6 +306,7 @@
return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
}
}
+ , { field: '鎺ユ敹鏁伴噺', title: '杩涚珯鎺ユ敹鏁伴噺' }
, { field: 'HEmpID', title: 'HEmpID', hide: true }
, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 125 }
, { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
@@ -316,7 +318,6 @@
, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
, { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
, { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
- , { field: '鎺ユ敹鏁伴噺', title: '杩涚珯鎺ユ敹鏁伴噺' }
]]
, text: {
none: '鏃犳暟鎹紒'
--
Gitblit v1.9.1