From 94bd70ca069aa3bb8546b77a2e99fd5c7ffc4c6a Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 七月 2022 08:27:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/组装单/Sc_PCruxBindingPDA.html | 844 ++++++++++++++++++++++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 22
WebTM/views/组装单/Sc_AssemblyBill_Fast.html | 35 -
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 7
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 1
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 3
WebTM/views/index_Mobile.html | 10
WebTM/Vlog/webapi20220728.txt | 53 +
WebTM/views/销售管理/销售订单/Xs_SeOrderBillDyColList.html | 133 --
WebTM/views/grf/cabinet-CG.grf | 404 +++++++++++
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 196 ++++-
WebTM/views/生产管理/生产投料单/Sc_PPickingBillList.html | 256 +++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_HPPickingBillList.aspx.designer.cs | 26
WebTM/views/计划管理/工艺路线/Gy_RoutingBillimport.html | 21
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_HPPickingBillList.aspx | 45 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_HPPickingBillList.aspx.cs | 17
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/index.html | 2
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/WebTM.csproj | 11
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 2
21 files changed, 1,879 insertions(+), 216 deletions(-)
diff --git a/WebTM/Vlog/webapi20220728.txt b/WebTM/Vlog/webapi20220728.txt
new file mode 100644
index 0000000..eca565f
--- /dev/null
+++ b/WebTM/Vlog/webapi20220728.txt
@@ -0,0 +1,53 @@
+2022/7/28 14:55:17 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 14:55:17 鎵撳嵃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 14:56:45 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 14:56:45 鎵撳嵃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:02:55 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:02:55 鎵撳嵃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')
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 59400e1..69842b0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -214,6 +214,7 @@
<Content Include="views\grf\鍖呰鏂瑰紡鏉＄爜.grf" />
<Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
<Content Include="views\grf\宸ュ簭娴佽浆.grf" />
+ <Content Include="views\grf\cabinet-CG.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -653,6 +654,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_HPPickingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
@@ -867,6 +869,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶曟枡鍗昞Sc_PPickingBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillList.html" />
@@ -905,6 +908,7 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameter_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameterList.html" />
+ <Content Include="views\缁勮鍗昞Sc_PCruxBindingPDA.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBill.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillimport.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupList.html" />
@@ -1344,6 +1348,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_HPPickingBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_HPPickingBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_HPPickingBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_HPPickingBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 71aa844..e7c8fe3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
@@ -17,7 +17,7 @@
//var WEBURL = "http://192.168.0.214/API/"; //鐟炰笌绁烘湇鍔″櫒
//var WEBURL = "http://192.168.10.66/API/"; //妫シ鏈嶅姟鍣�
//var WEBURL = "http://localhost/API/";
- var WEBURL = "http://60.191.27.141:8090/API/";
+ //var WEBURL = "http://60.191.27.141:8090/API/";
return WEBURL
}
diff --git a/WebTM/views/grf/cabinet-CG.grf b/WebTM/views/grf/cabinet-CG.grf
new file mode 100644
index 0000000..5f9f229
--- /dev/null
+++ b/WebTM/views/grf/cabinet-CG.grf
@@ -0,0 +1,404 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9
+ Height=6
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鏂欏彿'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鏁伴噺'
+ End
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='鏈哄彴缂栧彿'
+ End
+ Item
+ Name='鐢熶骇鎵瑰彿'
+ End
+ Item
+ Name='鍒剁▼'
+ End
+ Item
+ Name='鍑�閲�'
+ Type=Currency
+ Format='0.#########;;#'
+ End
+ Item
+ Name='姣涢噸'
+ Type=Currency
+ Format='0.#########;;#'
+ End
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='鍒朵綔浜�'
+ End
+ Item
+ Name='瀹㈡埛鍨嬪彿'
+ End
+ Item
+ Name='鍘嬫満鍨嬪彿'
+ End
+ Item
+ Name='鎵瑰彿2'
+ End
+ Item
+ Name='璁￠噺鍗曚綅'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='婧愬崟鍗曞彿'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ Item
+ Name='鐢熶骇宸ュ崟鍙�'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.60438
+ End
+ End
+ Object ColumnContent
+ Height=6.00604
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=MemoBox
+ Name='鍑礉濂堢壒'
+ Left=0.79375
+ Top=0.211667
+ Width=5.3975
+ Height=1.37583
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ TextAlign=MiddleCenter
+ CharSpacing=4
+ Text='鍑礉濂堢壒绉戞妧'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.79979
+ Top=0.211667
+ Width=1.79917
+ Height=1.37583
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.132292
+ Top=1.69333
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=6
+ Items FreeGridColumn
+ Item[1]
+ Width=1.56104
+ End
+ Item[2]
+ Width=1.85208
+ End
+ Item[3]
+ Width=0.873125
+ End
+ Item[4]
+ Width=1.19063
+ End
+ Item[5]
+ Width=1.00542
+ End
+ Item[6]
+ Width=2.14313
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.820208
+ End
+ Item[2]
+ Height=0.79375
+ End
+ Item[3]
+ Height=0.79375
+ End
+ Item[4]
+ Height=0.820208
+ End
+ Item[5]
+ Height=0.740833
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ Text='宸ュ崟鍙�'
+ End
+ Item[1,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ Text='[#婧愬崟鍗曞彿#]'
+ ColSpan=2
+ End
+ Item[1,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='渚涘簲鍟�'
+ End
+ Item[1,5]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ Text='[#渚涘簲鍟�#]'
+ ColSpan=2
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鐗╂枡鍚嶇О'
+ End
+ Item[2,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鐗╂枡鍚嶇О#]'
+ ColSpan=5
+ End
+ Item[3,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鐗╂枡缂栫爜'
+ End
+ Item[3,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鐗╂枡浠ｇ爜#]'
+ ColSpan=5
+ End
+ Item[4,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鏁伴噺'
+ DataName='鏁伴噺'
+ End
+ Item[4,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鏁伴噺#]'
+ End
+ Item[4,3]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鍗曚綅'
+ DataName='鍗曚綅'
+ End
+ Item[4,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#璁￠噺鍗曚綅#]'
+ End
+ Item[4,5]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鏃ユ湡'
+ End
+ Item[4,6]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鏃ユ湡#]'
+ End
+ Item[5,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='浜哄憳'
+ DataName='鎵撳嵃浜哄憳'
+ End
+ Item[5,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鍒朵綔浜�#]'
+ ColSpan=2
+ End
+ Item[5,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鎵瑰彿'
+ DataName='鎵撳嵃鏃ユ湡'
+ End
+ Item[5,5]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鎵瑰彿2#]'
+ ColSpan=2
+ End
+ End
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+ End
+End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 11095ff..5d705b3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -314,6 +314,7 @@
<a>鐢熶骇鐢ㄦ枡娓呭崟</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟缁存姢</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>
</dl>
</dd>
<dd>
@@ -376,6 +377,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
</dl>
</dd>
<dd>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 54ec103..a34038b 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -77,7 +77,7 @@
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260p x;">
<!-- 杞﹂棿绠＄悊 -->
- <!--<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>
@@ -138,6 +138,12 @@
</a>
</dd>
<dd>
+ <a lay-href="鐢熶骇绠＄悊/缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 浜х嚎鍏抽敭浠剁粦瀹�
+ </a>
+ </dd>
+ <dd>
<a lay-href="" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭姹囨姤鍗昻ull
@@ -156,7 +162,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/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 6de6730..f7df417 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/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -178,6 +178,9 @@
case "HProcessExchange"://宸ュ簭娴佽浆鍗�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + value, true, "");
break;
+ case "HPPickingBill"://鐢熶骇棰嗘枡鎷嗙爜鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_HPPickingBillList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
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_HPPickingBillList.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_HPPickingBillList.aspx"
new file mode 100644
index 0000000..470815f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx"
@@ -0,0 +1,45 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_HPPickingBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_HPPickingBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ var ids = Request.Params["linterid"];
+ var idsArray = ids.Split(',');
+ var PrintIds = "";
+ for (int i = 0; i < idsArray.Length; i++)
+ {
+ PrintIds += "'" + idsArray[i] + "',";
+ }
+ PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
+ string sql = string.Format(@"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 ("+ PrintIds+")");
+ LogService.Write(sql);
+ SqlXMLReportData.GenOneRecordset(this, sql);
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
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_HPPickingBillList.aspx.cs" "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_HPPickingBillList.aspx.cs"
new file mode 100644
index 0000000..031d5c8
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Sc_HPPickingBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
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_HPPickingBillList.aspx.designer.cs" "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_HPPickingBillList.aspx.designer.cs"
new file mode 100644
index 0000000..395ffd1
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Sc_HPPickingBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
index 24ac700..80fd5a0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -923,7 +923,7 @@
var checkStatus = table.checkStatus('mainTable6')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check6').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 758c667..a6faca9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -788,7 +788,6 @@
success: function (data1) {
if (data1.data.length != 0) {
-
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = ["HMaterID", "HUnitID", "HWorkShopID", "HPurchaseDeptID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
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"
new file mode 100644
index 0000000..abe5157
--- /dev/null
+++ "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"
@@ -0,0 +1,256 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" 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="HBillNo" id="HBillNo" 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;">
+ </div>
+ </div>
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <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="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on("toolbar(mainTable)", function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鎵撳嵃
+ case 'btn-print':
+ get_PrintReport();
+ break;
+ default:
+ break;
+ }
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ //鍒濆鍖栨棩鏈�
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type:"checkbox",fixed:"left" }
+ , { field: 'HInterID', title: 'HInterID', sort: true }
+ , { field: 'HEntryID', title: 'HEntryID', sort: 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 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '鏁伴噺', title: '鏁伴噺' }
+ , { field: '浠舵暟', title: '浠舵暟' }
+ , { field: '棰嗘枡鍗曞彿', title: '棰嗘枡鍗曞彿' }
+ , { field: '鐢ㄦ枡娓呭崟鍙�', title: '鐢ㄦ枡娓呭崟鍙�' }
+ ]]
+ };
+ option.data = [];
+ table.render(option);
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_PckSplit/Get_PPickingBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HBillCode = $("#HBillCode").val();//鍒跺崟浜�
+
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 棰嗘枡鍗曞彿 like '%" + HBillNo + "%'";
+ }
+ if (HBillCode) {
+ sWhere += " and 鏉″舰鐮� like '%" + HBillCode + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBillCode").val("");//閮ㄩ棬
+
+ sWhere = "";
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+ 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妯″潡
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 0ac634c..2b077fe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -208,6 +208,11 @@
});
})
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
@@ -715,7 +720,6 @@
}
, btn2: function (index, layero) { }
})
-
}
//蹇�熻繃婊�
@@ -752,6 +756,22 @@
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+ //鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
+ function btnrowDouble(obj) {
+ HMainICMOEntryID = obj["HICMOEntryID"];
+ HMainICMOInterID = obj["HICMOInterID"];
+ HICMOInterID = obj["HInterID"];
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
+ })
+ }
+
//閲嶇疆
function set_ClearQuery() {
$("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
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 e1095fa..c82f50a 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"
@@ -5,6 +5,7 @@
<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>
@@ -25,48 +26,73 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" 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" style="margin-left:30px">
+ <label class="layui-form-label">榻愬鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HComplete" id="HComplete" lay-filter="HComplete">
+ <option value="">鍏ㄩ儴</option>
+ <option value="榻愬">榻愬</option>
+ <option value="鏈綈濂�">鏈綈濂�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掓棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HPlanDate" style="width:190px;">
+ </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">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="鐗╂枡浠ｇ爜" id="鐗╂枡浠ｇ爜">
- </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="璧勬簮浠ｇ爜" id="璧勬簮浠ｇ爜">
- </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="閮ㄩ棬浠ｇ爜" id="閮ㄩ棬浠ｇ爜">
- </div>
- </div>
- </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 100px;">鏈夋棤閲囪喘璁㈠崟</label>
+ <div class="layui-input-block" style="width: 190px; margin-left: 130px;">
+ <select name="" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="鏈夐噰璐鍗�">鏈夐噰璐鍗�</option>
+ <option value="鏃犻噰璐鍗�">鏃犻噰璐鍗�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閿�鍞鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -100,8 +126,30 @@
, util = layui.util
var sWhere = "";
var option = [];
- //鍒濆鍖栫晫闈�
+ var HMainICMOEntryID = -1;//涓荤敓浜ц鍗曞瓙鍐呯爜
+ var HMainICMOInterID = -1;//涓荤敓浜ц鍗曚富鍐呯爜
+ var HICMOInterID = -1;//鏃ヨ鍒掕鍗曚富鍐呯爜
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+ if (!isNaN(OperationType)) {
+ HMainICMOEntryID = params[params[1]];
+ HMainICMOInterID = params[params[2]];
+ HICMOInterID = params[params[3]];
+ }
+
set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -116,11 +164,14 @@
break;
};
});
- //#region 鐢熶骇杞﹂棿
- form.on('submit(btnHWorkShopID)', function (data) {
- btnHWorkShopID();
+ //#endregion
+
+ //#region 鐗╂枡
+ form.on('submit(btnHMaterNumber)', function (data) {
+ btnHMaterNumber();
});
//#endregion
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -132,9 +183,15 @@
get_FastQuery();
});
//#endregion
+
+ //#endregion
+
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
@@ -160,11 +217,12 @@
, { field: '鏃ヨ鍒掕鍗曚富鍐呯爜', title: '鏃ヨ鍒掕鍗曚富鍐呯爜', hide: true }
, { field: '涓荤敓浜ц鍗曞瓙鍐呯爜', title: '涓荤敓浜ц鍗曞瓙鍐呯爜', hide: true }
, { field: '涓荤敓浜ц鍗曚富鍐呯爜', title: '涓荤敓浜ц鍗曚富鍐呯爜', hide: true }
- , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�' }
+ , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�', templet: "<div>{{d.鏃ヨ鍒掓棩鏈� =='' ?'':layui.util.toDateString(d.鏃ヨ鍒掓棩鏈�, 'yyyy-MM-dd')}}</div>" }
, { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
, { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺' }
+ , { field: '榻愬鐘舵��', title: '榻愬鐘舵��' }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
, { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺' }
, { field: '棰嗘枡鍗犵敤鏁伴噺', title: '棰嗘枡鍗犵敤鏁伴噺' }
@@ -189,7 +247,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_Complete/JIT_CompleteDetailList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "HMainICMOEntryID": HMainICMOEntryID, "HMainICMOInterID": HMainICMOInterID, "HICMOInterID": HICMOInterID },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
@@ -211,14 +269,22 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBillNo = $("#HBillNo").val();
- var HWorkShopIDName = $("#HWorkShopIDName").val();
+ var HMaterID = $("#HMaterID").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HComplete = $("#HComplete").val();
+ var HPlanDate = $("#HPlanDate").val();
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ if (HMaterID!="0") {
+ sWhere += " and 鐗╂枡ID = '" + HMaterID + "'";
}
- if (HWorkShopIDName) {
- sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡缂栫爜 = '" + HMaterNumber + "'";
+ }
+ if (HComplete) {
+ sWhere += " and 榻愬鐘舵�� = '" + HComplete + "'";
+ }
+ if (HPlanDate) {
+ sWhere += " and 鏃ヨ鍒掓棩鏈� = '" + HPlanDate + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -227,22 +293,26 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HWorkShopIDName").val("");
- $("#HBillNo").val("");
- $("#HWorkShopID").val("");
+ $("#HMaterID").val("0");
+ $("#HMaterNumber").val("");
+ $('#HComplete').val("");
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ form.render('select');
sWhere = "";
}
//#endregion
- //鐢熶骇杞﹂棿鍒楄〃
- function btnHWorkShopID() {
+ //鐗╂枡鍒楄〃
+ function btnHMaterNumber() {
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -251,14 +321,28 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
- $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_AssemblyBill_Fast.html" "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_AssemblyBill_Fast.html"
index 72243cc..3e482ac 100644
--- "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_AssemblyBill_Fast.html"
+++ "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_AssemblyBill_Fast.html"
@@ -9,29 +9,7 @@
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
</head>
-<!--<style>
- @media screen and (max-width: 450px) {
- .layui-form-item .mobile {
- display: inline-block;
- float: none;
- left: -3px;
- width: 55%;
- margin: 0 0 10px 10px;
- }
- .layui-form-item .layui-btn {
- position: relative;
- top: -6px;
- }
- .layui-form-item .layui-input.mobile {
- display: inline;
- float: none;
- left: -3px;
- width: 55%;
- margin: 0 0 10px 10px;
- }
- }
-</style>-->
<body>
<div class="layui-fluid">
<div class="layui-card" style="padding: 1px">
@@ -54,18 +32,6 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <!--<div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
- </div>
- <div class="layui-col-xs8">
- <select name=" HBillType">
- <option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
- </select>
- </div>
- </div>
- </div>-->
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs4">
@@ -305,7 +271,6 @@
$.ajax(
{
type: "POST",
- // url: "http://61.130.49.162:9090/WMSAPI///MateOut/set_SaveMateOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
url: GetWEBURL() + "/MateOut/set_SaveMateOutBill_Json",
async: true,
data: { "oMain": sMainStr },
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"
new file mode 100644
index 0000000..2f33e5b
--- /dev/null
+++ "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
@@ -0,0 +1,844 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎鍏抽敭浠剁粦瀹�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style>
+ .layui-table-cell {
+ height: auto;
+ white-space: normal;
+ }
+
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>浜х嚎鍏抽敭浠剁粦瀹�</span>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs1">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">SN鍙�</label>
+ </div>
+ <div class="layui-col-xs4">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+
+ <div class="layui-col-xs1" style="margin-left:40px">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">宸ュ簭</label>
+ </div>
+ <div class="layui-col-xs3" style="margin-left:-20px">
+ <input type="text" name="HProc" id="HProc" lay-verify="HProc" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcID-BT">...</button>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-col-xs1">
+ <label class="layui-form-label" style="width:50px;padding-left:0px;">鍏抽敭浠�</label>
+ </div>
+ <div class="layui-col-xs4">
+ <input type="text" name="HPCrux" id="HPCrux" lay-verify="HPCrux" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">閰嶄欢淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鏉＄爜娓呭崟</li>
+ <li lay-id="3" style="padding:1px;">鏃ュ織淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--閰嶄欢淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="pj-table" lay-filter="pj-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--鏉＄爜娓呭崟-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="tm-table" lay-filter="tm-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--鏃ュ織淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input mobile">
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璧勬簮</label>
+ </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">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎿嶄綔鍛�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HKeeperName" id="HKeeperName" lay-verify="HKeeperName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇鐝粍</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <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>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , table1 = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //娓呯┖鐣岄潰 new
+ var option = [];
+ var option1 = [];
+
+
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇宸ュ簭 鐢熶骇璧勬簮銆佹搷浣滃憳銆佺敓浜х彮缁勶級 new
+ //宸ュ簭
+ $("#HProcID").val(sessionStorage["HProcNo"]);
+ $("#HProc").val(sessionStorage["HProc"]);
+ //鐢熶骇璧勬簮
+ $("#HSCZY").val(sessionStorage["HSource"]);
+ $("#HSCZYID").val(sessionStorage["HSourceID"]);
+ //鎿嶄綔鍛�
+ $("#HKeeperName").val(sessionStorage["HKeeper"]);
+ $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+ //鐢熶骇鐝粍
+ $("#HGroupName").val(sessionStorage["HGroup"]);
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+ //榛樿鍏夋爣
+ $("#HBarCode").focus();
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ type: "GET",
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGridPJ();
+ set_InitGridTM();
+
+ //閫夋嫨宸ュ簭
+ form.on('submit(HKeeperID-BT)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(HKeeperID-BT)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+ //閫夋嫨鐝粍
+ form.on('submit(HGroupID-BT)', function (data) {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ sessionStorage["SourceFlag"] = false;
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.close();
+ });
+ })
+
+ //鍒犻櫎
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-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'
+ $.ajax(
+ {
+ type: "Get",
+ //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
+ async: true,
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+ 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");
+ }
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //鎻愪氦
+ 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(
+ {
+ type: "POST",
+ //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
+ async: true,
+ data: { "oMain": sMainStr },
+ 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"; }//鏂板
+ );
+ }
+ else {
+ //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ layui.form.render();
+ },
+ error: function (err) {
+ //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ return false;
+ }
+ });
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+
+ //SN鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var sBarCode = $('#HBarCode').val()
+ if (sBarCode == "") {
+ layer.msg("璇疯緭鍏N鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
+ type: "GET",
+ async: false,
+ data: { "HBarCode": sBarCode },
+ 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");
+ }
+ });
+ //鏄剧ず瀹屽悗锛屽厜鏍囧埌鍏抽敭浠朵笂
+ $("#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: "娓╅Θ鎻愮ず" });
+ 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'); //璺宠浆椤电
+ }
+ 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 (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.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");
+ }
+ });
+ }
+ 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");
+ }
+ }
+ 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");
+ }
+ });
+ }
+
+
+ //鍒濆鍖栬〃鏍尖�旈厤浠�
+ function set_InitGridPJ() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 150, hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 150 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 150 }
+ , { field: 'HCPM', title: '鎴愬搧鐮�', edit: 'text', width: 150 }
+ ];
+ option = {
+ elem: '#pj-table'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [columns]
+ };
+ option.data = [];
+ table.render(option);
+ }
+ //鍒濆鍖栬〃鏍尖�旀潯鐮�
+ function set_InitGridTM() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMaterID', title: 'HMaterID', 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 }
+ , { field: 'HPJM', title: '閰嶄欢鐮�', edit: 'text', width: 150 }
+ ];
+ option1 = {
+ elem: '#tm-table'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [columns]
+ };
+ 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;
+ }
+ }
+ });
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html"
index 52447f1..c8bb5bd 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html"
@@ -57,8 +57,8 @@
<label class="layui-form-label" style="width: 85px;">鏄惁杞伐搴�</label>
<div class="layui-input-block" style="margin-left: 120px; width: 85px;">
<select name=" HTProcessFlag" id="HTProcessFlag">
- <option value="0">鍚�</option>
<option value="1">鏄�</option>
+ <option value="0">鍚�</option>
</select>
</div>
</div>
@@ -155,6 +155,7 @@
//瀵煎叆 淇濆瓨鏁版嵁
form.on('submit(btnSave)', function (data) {
+
if (table.cache["mainTable"] != null) {
set_AddNew(data);
}
@@ -259,16 +260,16 @@
//瀵煎叆(淇濆瓨)
function set_AddNew(data) {
- var num = [];
- for (var i = 0; i < table.cache["mainTable"].length; i++) {
- if (table.cache["mainTable"][i] != "") {
- table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
- num.push(table.cache["mainTable"][i])
- }
- }
+ //var num = [];
+ //for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ // if (table.cache["mainTable"][i] != "") {
+ // table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ // num.push(table.cache["mainTable"][i])
+ // }
+ //}
data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(num);
+ var sSubStr = '1';//JSON.stringify(num)
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
var index = layer.load();
@@ -282,6 +283,8 @@
if (data.count == 1) {
layer.close(index);
layer.msg(data.Message);
+ option.data = null;
+ table.render(option);
}
else {
layer.close(index);
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 e76eb32..1927e29 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"
@@ -773,8 +773,9 @@
, toolbar: '#toolbarDemo'
, page: false
, cellMinWidth: 120
- , height: 500
+ , height: 400
, cols: [columns]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, done: function (res, curr, count) {
option.data = res.data;
//鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
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 0b1ad99..6b3900a 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"
@@ -352,11 +352,10 @@
option2 = {
elem: '#mainTable2'
//, toolbar: '#toolbarDemo'
- , page: true
- , height: 300
+ , page: false
+ , height: 500
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: [[
{ field: 'hsubid', title: 'hsubid', hide: true}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
index 0c17851..88cee18 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
@@ -2,13 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>閿�鍞鍗曞垪琛�</title>
+ <title>閿�鍞鍗曞姩鎬佸垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -58,14 +57,6 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
- </div>
- </div>
-
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -99,10 +90,6 @@
</div>
</div>
</div>
- <!--<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>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -160,66 +147,6 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125}
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125 }
- , { field: 'HBillType', title: 'HBillType', hide: true }
- , { field: 'HCusID', title: 'HCusID', hide: true }
- , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 125 }
- , { field: '瀹㈡埛', title: '瀹㈡埛' }
- , { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125 }
- , { field: 'HSSID', title: 'HSSID', hide: true }
- , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125 }
- , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125}
- , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170}
- , { field: 'HCurID', title: 'HCurID', hide: true }
- , { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜' }
- , { field: '甯佸埆', title: '甯佸埆' }
- , { field: '姹囩巼', title: '姹囩巼' }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125 }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
- , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�' }
- , { field: 'HManagerID', title: 'HManagerID', hide: true }
- , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜' }
- , { field: '涓荤', title: '涓荤' }
- , { field: 'HEmpID', title: 'HEmpID', hide: true }
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�' }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
- , { field: '鎽樿', title: '鎽樿' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: 'hsubid', title: 'hsubid', hide: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '鎵瑰彿', title: '鎵瑰彿' }
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '鍗曚环', title: '鍗曚环' }
- , { field: '閲戦', title: '閲戦' }
- , { field: '绋庣巼', title: '绋庣巼' }
- , { field: '绋庨', title: '绋庨' }
- , { field: '浠风◣鍚堣', title: '浠风◣鍚堣' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-
- ]]
};
}
@@ -227,15 +154,40 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ url: GetWEBURL() + '/Xs_SeOrderBill/DyColList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": "admin" },
success: function (data1) {
+ var col = [];
if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");//涓枃
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option.cols = [col];
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
- } else {
+ }
+ else
+ {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -286,33 +238,6 @@
$("#HDeptID").val("");
$("#HMangerID").val("");
sWhere = "";
- }
- //閲嶆柊鍚屾鎸夐挳
- function set_ResCnz() {
- var HBillno2 = $('#HBillno2').val();
- $.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
- type: "GET",
- data: { "HBillNo": HBillno2, "HBillType": 1401 },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
}
//#endregion
--
Gitblit v1.9.1