From d96116bd8ccf131bcd9d6773ff25449d514b7881 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期六, 30 七月 2022 15:18:38 +0800
Subject: [PATCH] 凯贝
---
WebTM/App_Data/MssqlReportData.cs | 3
WebTM/views/生产管理/生产投料单/Sc_PPickingBillList.html | 65 +++++
WebTM/views/组装单/Sc_PCruxBindingPDA.html | 460 +++++--------------------------------
WebTM/views/index_Mobile.html | 2
WebTM/Vlog/webapi20220730.txt | 87 +++++++
WebTM/Vlog/webapi20220728.txt | 80 ++++++
6 files changed, 298 insertions(+), 399 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 47fd479..ec5dfe4 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -20,8 +20,9 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳
- public const string SqlConnStr = "Data Source=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.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
+ public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
//public string sServer;
//public string sDataBase;
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/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index a34038b..7b5ec0c 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>
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\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;
- }
- }
+
});
--
Gitblit v1.9.1