diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index def0f29..e3baedd 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe
index d610aa7..914c1db 100644
Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb
index 534a882..33d3a67 100644
Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll
index 332ce6d..b7f4da1 100644
Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ
diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb
index 4fe2cb1..0737392 100644
Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll
index 91bd58d..d4799a5 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb
index 722223f..6cb428f 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
index f9f2e58..9b91f71 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache
index 580e9dc..bd9c3bb 100644
--- a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache
+++ b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0abd85b80046b9258518751daf3009dfc20e23db
+65ea42614d5210ce1f76f304a0b99eadc686e4a3
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe
index d610aa7..914c1db 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb
index 534a882..33d3a67 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ
diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll
index 332ce6d..b7f4da1 100644
Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb
index 4fe2cb1..0737392 100644
Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache
index a948177..86f494c 100644
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache
index 23dc6dc..d4e0d75 100644
--- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache
+++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ae55a20c78909b7f5eb9ba6dc5a5b469abf93216
+cfb04e75b94c39ee4374f63be8ad6b6fac4e7180
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll
index 332ce6d..b7f4da1 100644
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb
index 4fe2cb1..0737392 100644
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache
index e964739..90935ef 100644
--- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache
+++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache
@@ -4,7 +4,7 @@
library
C#
.cs
-E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\
CommonFunc
none
false
@@ -13,7 +13,7 @@ DEBUG;TRACE
12023204370
2-1355062061
241494203934
-44-170053996
+44-239516262
HMessageBox.xaml;
False
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref
index ff7c908..da2c703 100644
--- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref
+++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref
@@ -1,4 +1,4 @@
-FE:\workspace\LanJu\client\shangjian\CommonFunc\HMessageBox.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;;
diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll
index 332ce6d..b7f4da1 100644
Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ
diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb
index 4fe2cb1..0737392 100644
Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ
diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll
index d6b2065..26b49a0 100644
Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll and b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll differ
diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb
index 2c98b2c..a6ba9df 100644
Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb differ
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache
index c54e5b7..078b748 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache
index ad46bb4..cc8d6fc 100644
--- a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache
+++ b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-93e6bdf40a6f5d4b88993bae3e272b7f08763f68
+75b64367c22655afbbe469bfdef148da7e480363
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll
index d6b2065..26b49a0 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll and b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll differ
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb
index 2c98b2c..a6ba9df 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb differ
diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs
index 3e7c349..791b441 100644
--- a/shangjian/XGL.Data/DBService/DringRoomService.cs
+++ b/shangjian/XGL.Data/DBService/DringRoomService.cs
@@ -46,7 +46,8 @@ namespace XGL.Data.DBService
public DataTable GetDringRoomData(string devicecode,int inout)
{
- string sql = $@"SELECT ROW_NUMBER() OVER (ORDER BY create_time) AS RowNumber,rfid_no,device_code,type,create_time,update_time,factory_no,workorder_code,material_code FROM [dbo].[mes_dryinghouse_info] where device_code = '{devicecode}' and type = '{inout}' and del_flag='0' order by create_time ;";
+ string sql = $@"SELECT ROW_NUMBER() OVER (ORDER BY dry.create_time) AS RowNumber,rfid_no,device_code,type,dry.create_time,dry.update_time,factory_no,dry.workorder_code,material_code,product_name FROM [dbo].[mes_dryinghouse_info] dry
+LEFT JOIN pro_order_workorder workorder on dry.workorder_code = workorder.workorder_code where device_code = '{devicecode}' and type = '{inout}' and dry.del_flag='0' order by dry.create_time ;";
//获取绑定中,且RFID没有出烘房(在烘房内)的数据
// string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res
//LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id where equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1')";
diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs
index 736a8ef..c57cfc3 100644
--- a/shangjian/XGL.Data/DBService/FormingMachineService.cs
+++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs
@@ -56,7 +56,7 @@ WHERE
WHERE
Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
- )
+ ) And ord.prod_line_code like '%{devicecode}%'
ORDER BY
( isnull( plan_time, '1900-01-01 08:00:00' ) ) DESC";
@@ -67,6 +67,20 @@ ORDER BY
}
return null;
}
+
+ public DataTable GetShiftList()
+ {
+ string sql = $@"select shift_id,Shift_Code,Shift_Desc,Shift_Start_Time,Shift_End_Time from base_shifts_t where del_flag ='0' ";
+
+ DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
+
+ if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
+ {
+ return dtset.Tables[0];
+ }
+ return null;
+ }
+
///
/// 获取成型机状态
///
@@ -113,15 +127,15 @@ ORDER BY
///
///
///
- public DataTable GetInOutHistoryList(string devicecode)
+ public DataTable GetInOutHistoryList(string workOrderCode,string devicecode,string workDate)
{
- string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num,
+ string sql = $@"SELECT DISTINCT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num,
isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status,ord.route_code,ord.attr1,work_batch_code,res.taskcode,res.rfid,plan_time ,res.update_time
FROM [dbo].[mes_material_transfer_result] res
LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id
left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id
LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid
-where equipmentCode = '{devicecode}' and res.OrderCode is not null ORDER BY plan_time desc; ";
+where equipmentCode = '{devicecode}' and work_date = '{workDate}' and ord.workorder_code = '{workOrderCode}' and res.OrderCode is not null ORDER BY plan_time desc; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll
index 332ce6d..b7f4da1 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb
index 4fe2cb1..0737392 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll
index d6b2065..26b49a0 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb
index 2c98b2c..a6ba9df 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
index 91bd58d..d4799a5 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb
index 722223f..6cb428f 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache
index 0b3a162..1f5323f 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache
index 2d5a30b..da343cf 100644
--- a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache
+++ b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-45efadceadc58f77d05a25f4464e8495a412c5d8
+79f02adf94b81a462e2d021ffaeb806c569f29e2
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll
index 91bd58d..d4799a5 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb
index 722223f..6cb428f 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index aa73f2f..58bd50d 100644
Binary files a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache
index 211aafc..3c1dbc9 100644
Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache and b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index 21b6694..9842ae1 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,10 +12,12 @@
-
+
+
-
-
+
+
+
diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml
index 36c5038..8a44fae 100644
--- a/shangjian/XGL/FormItem/Main.xaml
+++ b/shangjian/XGL/FormItem/Main.xaml
@@ -14,7 +14,7 @@
WindowStartupLocation="CenterScreen"
WindowState="Maximized"
WindowStyle="None"
- mc:Ignorable="d" Loaded="Window_Loaded">
+ mc:Ignorable="d" Loaded="Window_Loaded" Closing="Window_Closing">
diff --git a/shangjian/XGL/Resources/startOrder2.png b/shangjian/XGL/Resources/startOrder2.png
new file mode 100644
index 0000000..6bd2d06
Binary files /dev/null and b/shangjian/XGL/Resources/startOrder2.png differ
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml
index a512720..2cf1e64 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml
@@ -43,7 +43,7 @@
Style="{DynamicResource ListBoxItemNormalBackground_Border_Style}">
-
@@ -80,7 +80,7 @@
Height="102"
VerticalAlignment="Top"
HorizontalAlignment="Left" >
-
+
-