From 11b2bdb8666e002a0e6454c446f4cd31d83b09f2 Mon Sep 17 00:00:00 2001 From: zhaojian Date: Fri, 10 May 2024 18:08:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=B0=E9=87=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shangjian/.vs/BL/v17/.suo | Bin 901120 -> 962048 bytes shangjian/RestartApp/bin/Debug/RestartApp.exe | Bin 8704 -> 8704 bytes shangjian/RestartApp/bin/Debug/RestartApp.pdb | Bin 28160 -> 28160 bytes .../RestartApp.csproj.CoreCompileInputs.cache | 2 +- .../RestartApp.csproj.FileListAbsolute.txt | 12 + shangjian/RestartApp/obj/Debug/RestartApp.exe | Bin 8704 -> 8704 bytes shangjian/RestartApp/obj/Debug/RestartApp.pdb | Bin 28160 -> 28160 bytes .../FinishProdDBService.cs | 53 ++- shangjian/XGL.Model/CheckTaskDetailModel.cs | 40 ++ shangjian/XGL.Model/XGL.Models.csproj | 1 + shangjian/XGLFinishPro/App.config | 4 +- shangjian/XGLFinishPro/FormItem/Main.xaml.cs | 10 +- shangjian/XGLFinishPro/Views/LanJu_InOut.xaml | 4 +- .../XGLFinishPro/Views/weighWindows.xaml | 193 +++++++-- .../XGLFinishPro/Views/weighWindows.xaml.cs | 383 +++++++++++++++++- 15 files changed, 647 insertions(+), 55 deletions(-) create mode 100644 shangjian/XGL.Model/CheckTaskDetailModel.cs diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index d4586027e840727d1155dd40b02148be71522feb..42d1b6c88196532b7a89754f52efa66ec8ca8423 100644 GIT binary patch delta 44177 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 bpJPO@#_Sh&F@9pc7|#2y!~du_>-_%*5JvEG delta 25862 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 diff --git a/shangjian/RestartApp/bin/Debug/RestartApp.pdb b/shangjian/RestartApp/bin/Debug/RestartApp.pdb index b6ebbc147ead3579da0569fc798a2736fcea2db0..e87a70e33fc3278741d0985c7eede9dd1d93fb8f 100644 GIT binary patch delta 1811 zcmZp;!`N_#af5`Aa|Dw(gGs8hvVyLHiJqCBfv&Nhk+G4frJjX$vT<^uB<6XQ#ynfr@}j@%$&RikdwZYF*)@4$ve;xlIc}v?WTiQYd0CiB8+{a%h&0i_ zi;ox+4=RXFe(S?WoT-7tm}ux5NStY6ldBb^i81k@f~D#YMg|6NP=Eq~GY|v03@$+2 z2E=E8SO_T4I=RtGda{+`v55g5lazco)q&z5aAtC&l5jmpB}gYobt(|U0LWAgAV>O< z0ppP^{tX#GHpn)RT96#FT9Az}wF_M|Zh_Q-Tmn)Hl0#P83Y37U{dnxD&}5KekTXGw zL6WH(9oZQ-sqhGKfdd7(XIh!mBm>AnO7g}xRW-QsP>NcB6j{~U238-c( z5EGdM{N%WZiwTkT7^Q~3F~lf4 zs9-qxr7w@;19?z1Ffa%MF*^`f05J~`g8(ZKa{)0M5K93u2N0hGVqPHD24Zd?cHeB~ zcM9z701hcdVB)a=3VO3ZXdn{|zAC6gWG#mq_zQW8s2^^%Jj7*eca%7I#o z!CJF3Qeq0AT64f!!6Zy;g^z+ZDOMRIt7wyA{x3NdlFWCI4>eKUtb2 zJ1P|{CwlNGY+__!@Bzk*9x!^kfOrOw{TztRfa1PDdUB(c$mCB7$0jNHB-#M^AOO;% z0i>lL88Ci4_H=RvkPT7~G6y7=3Z!8GWEM>AucEH0AhjSnKx#p9$ZESLH!2BBf?NWU z1-S-U)_3w+C2>xW49H!n8y(phH>vOlae-_G0X?S8j6ts$H(3-gG0xarXtkLeNU6Hb zW-?a>s_+J?I1a?5Bnw~)G)1I9(sYs+fuz_0OthP&ybdu=@{wUYIa$`nlBDRb@X;no zJut~ne(A$ak{&VN7?RXiDi}s{0ON=ch(VFMz#d2dfiMuWgINp=tU#Izh}nSnHW2dy zu@n%4^l1YzHxM@hF%J+Y0Sy6}1p;>hjW;)1)iX{Eu$>gZA>|58Toyp#d=>}|Rs$sL zm^Uj0Xt52#q#mKd0!q&@v)Rl+X?Ye9ivj&dN{S&rJ%b8J(rh9*{crxCd>5FOStO6` n`gRc%`#myGg{B_3;kxKwX6c^i>sF1XaZ=KF7XCDzb&nYUB7#-+ diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache index 612fb61..ec34d58 100644 --- a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache +++ b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -480a3b974159ff526098f6d65536fd513e8930601ce13afba64b502e068040c0 +87734e5521f63693b47ee067c370e002346211d3 diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt index a710516..a7b3f64 100644 --- a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt +++ b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt @@ -9,3 +9,15 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\RestartApp\obj\Debug\Resta D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.csproj.CopyComplete D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.exe D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.pdb +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\bin\Debug\RestartApp.exe.config +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\bin\Debug\RestartApp.exe +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\bin\Debug\RestartApp.pdb +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\bin\Debug\HtmlAgilityPack.dll +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\bin\Debug\HtmlAgilityPack.pdb +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\bin\Debug\HtmlAgilityPack.xml +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\obj\Debug\RestartApp.csproj.AssemblyReference.cache +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\obj\Debug\RestartApp.csproj.SuggestedBindingRedirects.cache +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\obj\Debug\RestartApp.csproj.CoreCompileInputs.cache +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\obj\Debug\RestartApp.csproj.CopyComplete +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\obj\Debug\RestartApp.exe +E:\workspace\LanJu\榄菊上位机\shangjian\RestartApp\obj\Debug\RestartApp.pdb diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.exe b/shangjian/RestartApp/obj/Debug/RestartApp.exe index d6c53e2f8596274cf45d5ebf11920c75860a7147..372fb7225e64b0c35f6ad334118a3ff1c6c6af1a 100644 GIT binary patch delta 188 zcmZp0X>gg)!SdMqSl7fJ8OB``SB5jDPG)4RXFM>u5lGJ5%*Z4zBA}P`#GS8oiqnMY z`3E%@o_fAnLu>&PucY1VM+`u~1jLz>uS#f}H68jDpQ69Rd+Ws9YE`!`Jw~96t5r;S zeo=ODL1J=hj89^oS82?%Wi2oIyPoXmda}3o*_>UI?Irbvdd)#bLBMhlTVbN27~{;z g(gg)!4g=xbjQRV8OB2sSB5j@O=e`QXFM^v5lAlD%*Z4zA~5Uj*@iD{*PXZX zw108kcKrKh4Y37GyvKHZyT||pOh8;T`KpAreUHpjp{WOMxGwsaS-R)>x>bxo85gUV z@cg3e;DW^D)EI9MmzaQ}{H)aEk{F-FysT0PshgaWnVMHJ*-TPjXqq|5ObFNjVk=Bk n6k}X8xldA?^}i~Eg2Uv4lJ1-Nq<*n79Wmc5sPLX~q5(SqGs;H_ diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.pdb b/shangjian/RestartApp/obj/Debug/RestartApp.pdb index b6ebbc147ead3579da0569fc798a2736fcea2db0..e87a70e33fc3278741d0985c7eede9dd1d93fb8f 100644 GIT binary patch delta 1811 zcmZp;!`N_#af5`Aa|Dw(gGs8hvVyLHiJqCBfv&Nhk+G4frJjX$vT<^uB<6XQ#ynfr@}j@%$&RikdwZYF*)@4$ve;xlIc}v?WTiQYd0CiB8+{a%h&0i_ zi;ox+4=RXFe(S?WoT-7tm}ux5NStY6ldBb^i81k@f~D#YMg|6NP=Eq~GY|v03@$+2 z2E=E8SO_T4I=RtGda{+`v55g5lazco)q&z5aAtC&l5jmpB}gYobt(|U0LWAgAV>O< z0ppP^{tX#GHpn)RT96#FT9Az}wF_M|Zh_Q-Tmn)Hl0#P83Y37U{dnxD&}5KekTXGw zL6WH(9oZQ-sqhGKfdd7(XIh!mBm>AnO7g}xRW-QsP>NcB6j{~U238-c( z5EGdM{N%WZiwTkT7^Q~3F~lf4 zs9-qxr7w@;19?z1Ffa%MF*^`f05J~`g8(ZKa{)0M5K93u2N0hGVqPHD24Zd?cHeB~ zcM9z701hcdVB)a=3VO3ZXdn{|zAC6gWG#mq_zQW8s2^^%Jj7*eca%7I#o z!CJF3Qeq0AT64f!!6Zy;g^z+ZDOMRIt7wyA{x3NdlFWCI4>eKUtb2 zJ1P|{CwlNGY+__!@Bzk*9x!^kfOrOw{TztRfa1PDdUB(c$mCB7$0jNHB-#M^AOO;% z0i>lL88Ci4_H=RvkPT7~G6y7=3Z!8GWEM>AucEH0AhjSnKx#p9$ZESLH!2BBf?NWU z1-S-U)_3w+C2>xW49H!n8y(phH>vOlae-_G0X?S8j6ts$H(3-gG0xarXtkLeNU6Hb zW-?a>s_+J?I1a?5Bnw~)G)1I9(sYs+fuz_0OthP&ybdu=@{wUYIa$`nlBDRb@X;no zJut~ne(A$ak{&VN7?RXiDi}s{0ON=ch(VFMz#d2dfiMuWgINp=tU#Izh}nSnHW2dy zu@n%4^l1YzHxM@hF%J+Y0Sy6}1p;>hjW;)1)iX{Eu$>gZA>|58Toyp#d=>}|Rs$sL zm^Uj0Xt52#q#mKd0!q&@v)Rl+X?Ye9ivj&dN{S&rJ%b8J(rh9*{crxCd>5FOStO6` n`gRc%`#myGg{B_3;kxKwX6c^i>sF1XaZ=KF7XCDzb&nYUB7#-+ diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs index 422f99d..4f39f22 100644 --- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs +++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs @@ -12,6 +12,7 @@ using System.Data.SqlClient; using MySql.Data.MySqlClient; using CommonFunc.Tools; using XGL.Models.Model; +using XGL.Models; namespace XGL.Dats.DBServiceFinishProd { @@ -3377,10 +3378,58 @@ left join basedata_plcsetting f on a.PlcId5=f.Id } return Items; } - - + public DataTable WeighingTask(string strWhere) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("select qt.check_name,"); + strSql.Append(" qct.check_type, "); + strSql.Append(" qct.check_no,"); + strSql.Append(" qct.material_code,"); + strSql.Append(" qct.material_name, "); + strSql.Append(" qct.income_time, "); + strSql.Append(" qctd.rule_name, "); + strSql.Append(" qctd.record_id, "); + strSql.Append(" qctd.actual_value "); + strSql.Append("from qc_check_task qct "); + strSql.Append("left join qc_check_type qt on qt.order_code = qct.check_type "); + strSql.Append("left join qc_check_task_detail qctd on qctd.belong_to = qct.record_id "); + strSql.Append("left join qc_check_type_project qctp on qctd.type_project_id = qctp.id"); + if (!string.IsNullOrWhiteSpace(strWhere)) + { + strSql.Append(" where 1=1 " + strWhere); + strSql.Append(" and qctp.weight = '1' and qctp.del_flag = '0' and qct.del_flag = '0' and qt.del_flag = '0' and qctd.del_flag = '0'"); + } + else + { + strSql.Append(" where qctp.weight = '1' and qctp.del_flag = '0' and qct.del_flag = '0' and qt.del_flag = '0' and qctd.del_flag = '0'"); + } + DataSet dtset= Utils.netClientDBHelper.getDataSet(strSql.ToString()); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + public void InsertCheckTaskDetail(string value,string where) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("UPDATE qc_check_task_detail "); + strSql.Append("SET actual_value ="); + if (value==null) + { + strSql.Append("NULL"); + } + else + { + strSql.Append($"'{value}'"); + } + + strSql.Append(" WHERE record_id ="); + strSql.Append($"'{where}'"); + int rowsAffected = Utils.netClientDBHelper.executeUpdate(strSql.ToString()); + } // /// // /// 获取物料bom列表 diff --git a/shangjian/XGL.Model/CheckTaskDetailModel.cs b/shangjian/XGL.Model/CheckTaskDetailModel.cs new file mode 100644 index 0000000..bb44820 --- /dev/null +++ b/shangjian/XGL.Model/CheckTaskDetailModel.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Models +{ + public class CheckTaskDetailModel + { + public string record_id { get; set; } + public string belong_to { get; set; } + public string order_num { get; set; } + public string rule_name { get; set; } + public string property_code { get; set; } + public string check_mode { get; set; } + public string check_tool { get; set; } + public string unit_code { get; set; } + public string check_standard { get; set; } + public string actual_value { get; set; } + public string status { get; set; } + public string remark { get; set; } + public string attr1 { get; set; } + public string attr2 { get; set; } + public string attr3 { get; set; } + public string attr4 { get; set; } + public string create_by { get; set; } + public DateTime create_time { get; set; } + public string update_by { get; set; } + public DateTime update_time { get; set; } + public string factory_code { get; set; } + public string del_flag { get; set; } + public string project_id { get; set; } + public string project_no { get; set; } + public string type_project_id { get; set; } + public string defect_code { get; set; } + public string defect_quality { get; set; } + public string defect_name { get; set; } + } +} diff --git a/shangjian/XGL.Model/XGL.Models.csproj b/shangjian/XGL.Model/XGL.Models.csproj index 1386420..911fe85 100644 --- a/shangjian/XGL.Model/XGL.Models.csproj +++ b/shangjian/XGL.Model/XGL.Models.csproj @@ -84,6 +84,7 @@ + diff --git a/shangjian/XGLFinishPro/App.config b/shangjian/XGLFinishPro/App.config index c8a4b7e..6be8e9c 100644 --- a/shangjian/XGLFinishPro/App.config +++ b/shangjian/XGLFinishPro/App.config @@ -11,8 +11,8 @@ - - + + diff --git a/shangjian/XGLFinishPro/FormItem/Main.xaml.cs b/shangjian/XGLFinishPro/FormItem/Main.xaml.cs index 44fec64..da4184d 100644 --- a/shangjian/XGLFinishPro/FormItem/Main.xaml.cs +++ b/shangjian/XGLFinishPro/FormItem/Main.xaml.cs @@ -96,16 +96,16 @@ namespace XGLFinishPro.FormItem this.Index.Content = dryingRoomUC; } else if (Utils.GetAppSetting("ClientMode").Equals("3")) - { - weighWindows weighWindows = new weighWindows(); - this.Index.Content = weighWindows; - } - else { LanJu_User lanJu_User = new LanJu_User(); this.Index.Content = lanJu_User; } + else if (Utils.GetAppSetting("ClientMode").Equals("4")) + { + weighWindows weighWindows = new weighWindows(); + this.Index.Content = weighWindows; + } } private void Timer_Elapsed(object sender, ElapsedEventArgs e) diff --git a/shangjian/XGLFinishPro/Views/LanJu_InOut.xaml b/shangjian/XGLFinishPro/Views/LanJu_InOut.xaml index 63293ee..c009431 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_InOut.xaml +++ b/shangjian/XGLFinishPro/Views/LanJu_InOut.xaml @@ -16,9 +16,9 @@ - + + + + @@ -27,7 +75,7 @@