Merge branch 'master' of http://139.155.15.221:3000/zoulei/DW5S

DW5S.App/EditForms/CdbEditor.cs

@@ -67,6 +67,7 @@ namespace DW5S.App.EditForms
                 info.Lon=Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
+                info.TxType = EnumTxType.Cdb;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/EditForms/CxEditor.cs

@@ -64,6 +64,7 @@ namespace DW5S.App.EditForms
                 info.Lon=Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
+                info.TxType = EnumTxType.Cx;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/EditForms/RefEditor.cs

@@ -66,6 +66,7 @@ namespace DW5S.App.EditForms
                 info.Lon=Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
+                info.TxType = EnumTxType.Ref;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/UserControl/CtrlRecTx.cs

@@ -40,7 +40,6 @@ namespace DW5S.App.UserControl
                 IocContainer.Logger.Error(ex, msg);
                 DxHelper.MsgBoxHelper.ShowError(msg);
             }
-
         }
 
         private async Task<RecTxViewModel> Add()
@@ -52,7 +51,7 @@ namespace DW5S.App.UserControl
                 var addItem = frm.info;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsRecTx = unitOfWork.Of<TxInfo>();
-                await repsRecTx.AddOrUpdateAsync(addItem.To<TxInfo>());
+               var res = await repsRecTx.AddOrUpdateAsync(addItem);
                 await unitOfWork.SaveAsync();
                 return addItem.To<RecTxViewModel>();
             }