Merge branch 'master' of ssh://10.10.101.21/source/mes-client

.gitignore

@@ -1,4 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and
+## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.csproj
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -21,6 +22,7 @@ build/
 bld/
 [Bb]in/
 [Oo]bj/
+/UAS-MES/UAS-MES.csproj
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -66,6 +68,7 @@ artifacts/
 *.pidb
 *.svclog
 *.scc
+*.csproj
 
 # Chutzpah Test files
 _Chutzpah*
@@ -212,7 +215,5 @@ _Pvt_Extensions/
 ModelManifest.xml
 *.rar
 /MES接口/MES接口.csproj
-/UAS-出货标签管理.zip
 /UAS-MES/Tool/MES_Interface.dll
-/UAS-MES/CustomControl/DataGrid_View/DataGridViewWithSerialNum.resx
-*.csproj
+/UAS-MES/UAS-MES.csproj

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -239,6 +239,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSql("update makeserial set ms_nextmacode='" + ma_code.Text + "' where ms_sncode='" + ms_beforesn + "' and ms_nextmacode='" + ms_makecode + "'", "update");
                                 }
                                 OperateResult.AppendText(">>序列号" + sn_code.Text + "归属工单" + ma_code.Text + "成功。\n", Color.Green);
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "返工信息采集", "序列号归属成功", sn_code.Text, "");
                                 getsnqty.Text = dh.getFieldDataByCondition("makeserial ", "count(1)", "ms_makecode='" + ma_code.Text + "'").ToString();
                                 if (AutoPrint.Checked)
                                 {