From 90d9cc76ed8697a5fc2034f0f95272f6dcec4406 Mon Sep 17 00:00:00 2001 From: bobwang <8205347@qq.com> Date: Mon, 27 May 2024 10:29:29 +0800 Subject: [PATCH] deskcustomer add toFlowNo --- Model/wms/data/basic/WmsDeskCustomer_base.cs | 20 ++++-- .../data/basic/WmsDeskCustomer_base_Imp.cs | 62 +++++++++++++++++-- WcfService1/wcfData/wcfWmsDeskCustomer.cs | 44 +++++++++++-- 3 files changed, 114 insertions(+), 12 deletions(-) diff --git a/Model/wms/data/basic/WmsDeskCustomer_base.cs b/Model/wms/data/basic/WmsDeskCustomer_base.cs index 3ee7da6..82fdde2 100644 --- a/Model/wms/data/basic/WmsDeskCustomer_base.cs +++ b/Model/wms/data/basic/WmsDeskCustomer_base.cs @@ -2,7 +2,7 @@ ///Data Object ///BASIC CLASS FOR TABLE t_wmsDeskCustomer ///By wm -///on 03/21/2024 +///on 05/27/2024 /// using System; @@ -22,8 +22,10 @@ namespace DeiNiu.wms.Data.Model internal int _partion,_Opartion; internal int _deskId,_OdeskId; - internal int _custid,_Ocustid; + internal string _custid = String.Empty,_Ocustid= String.Empty; internal string _custName = String.Empty,_OcustName= String.Empty; + internal int _lightId,_OlightId; + internal string _flowNo = String.Empty,_OflowNo= String.Empty; internal string _partionName = String.Empty,_OpartionName= String.Empty; internal string _mem = String.Empty,_Omem= String.Empty; internal int _portNo,_OportNo; @@ -62,7 +64,7 @@ namespace DeiNiu.wms.Data.Model set {_deskId = value;} } - public int custid{ + public string custid{ get {return _custid;} set {_custid = value;} } @@ -72,6 +74,16 @@ namespace DeiNiu.wms.Data.Model set {_custName = value;} } + public int lightId{ + get {return _lightId;} + set {_lightId = value;} + } + + public string flowNo{ + get {return _flowNo;} + set {_flowNo = value;} + } + public string partionName{ get {return _partionName;} set {_partionName = value;} @@ -111,7 +123,7 @@ namespace DeiNiu.wms.Data.Model #endregion #region fieldNames - public enum fields{partion,deskId,custid,custName,partionName,mem,portNo,operater} + public enum fields{partion,deskId,custid,custName,lightId,flowNo,partionName,mem,portNo,operater} #endregion diff --git a/Model/wms/data/basic/WmsDeskCustomer_base_Imp.cs b/Model/wms/data/basic/WmsDeskCustomer_base_Imp.cs index 33099ce..b5c7b03 100644 --- a/Model/wms/data/basic/WmsDeskCustomer_base_Imp.cs +++ b/Model/wms/data/basic/WmsDeskCustomer_base_Imp.cs @@ -2,7 +2,7 @@ ///Data Implemention Object ///BASIC CRUD CLASS FOR TABLE t_wmsDeskCustomer ///By wm -///on 03/21/2024 +///on 05/27/2024 /// @@ -78,8 +78,8 @@ namespace DeiNiu.wms.Data.Model { try { - tmpObj._custid = Convert.ToInt32(dr["custid"].ToString()); ; - tmpObj._Ocustid = Convert.ToInt32(dr["custid"].ToString()); ; + tmpObj._custid = dr["custid"].ToString() ; + tmpObj._Ocustid = dr["custid"].ToString() ; } catch (Exception er) { @@ -109,6 +109,42 @@ namespace DeiNiu.wms.Data.Model } + } + if (dr.Table.Columns.Contains("lightId") && !(dr["lightId"] is DBNull)) + { + try + { + tmpObj._lightId = Convert.ToInt32(dr["lightId"].ToString()); ; + tmpObj._OlightId = Convert.ToInt32(dr["lightId"].ToString()); ; + } + catch (Exception er) + { + LogHelper.debug(this.GetType(), "lightId value :"+ dr["lightId"].ToString()); + + LogHelper.debug(this.GetType(), er.Message); + + + } + + + } + if (dr.Table.Columns.Contains("flowNo") && !(dr["flowNo"] is DBNull)) + { + try + { + tmpObj._flowNo = dr["flowNo"].ToString() ; + tmpObj._OflowNo = dr["flowNo"].ToString() ; + } + catch (Exception er) + { + LogHelper.debug(this.GetType(), "flowNo value :"+ dr["flowNo"].ToString()); + + LogHelper.debug(this.GetType(), er.Message); + + + } + + } if (dr.Table.Columns.Contains("partionName") && !(dr["partionName"] is DBNull)) { @@ -245,7 +281,7 @@ namespace DeiNiu.wms.Data.Model break; case (int)op_flag.update: - // _strSql = "UPDATE dbo.T_WMSDESKCUSTOMER SET PARTION = @PARTION,DESKID = @DESKID,CUSTID = @CUSTID,CUSTNAME = @CUSTNAME,PARTIONNAME = @PARTIONNAME,MEM = @MEM,PORTNO = @PORTNO,OPERATER = @OPERATER,LASTMODIFIED = getdate() WHERE ID = @ID"; + // _strSql = "UPDATE dbo.T_WMSDESKCUSTOMER SET PARTION = @PARTION,DESKID = @DESKID,CUSTID = @CUSTID,CUSTNAME = @CUSTNAME,LIGHTID = @LIGHTID,FLOWNO = @FLOWNO,PARTIONNAME = @PARTIONNAME,MEM = @MEM,PORTNO = @PORTNO,OPERATER = @OPERATER,LASTMODIFIED = getdate() WHERE ID = @ID"; _strSql = "UPDATE dbo.T_WMSDESKCUSTOMER {0} WHERE ID = @ID"; _strSql = String.Format(_strSql, getChangedFields(tmpObj) ); break; @@ -286,6 +322,8 @@ namespace DeiNiu.wms.Data.Model colums+= tmpObj._deskId == null ? "" : "DESKID" + ","; colums+= tmpObj._custid == null ? "" : "CUSTID" + ","; colums+= tmpObj._custName == null ? "" : "CUSTNAME" + ","; + colums+= tmpObj._lightId == null ? "" : "LIGHTID" + ","; + colums+= tmpObj._flowNo == null ? "" : "FLOWNO" + ","; colums+= tmpObj._partionName == null ? "" : "PARTIONNAME" + ","; colums+= tmpObj._mem == null ? "" : "MEM" + ","; colums+= tmpObj._portNo == null ? "" : "PORTNO" + ","; @@ -301,6 +339,8 @@ namespace DeiNiu.wms.Data.Model values+= tmpObj._deskId == null ? "" : "@DESKID" + ","; values+= tmpObj._custid == null ? "" : "@CUSTID" + ","; values+= tmpObj._custName == null ? "" : "@CUSTNAME" + ","; + values+= tmpObj._lightId == null ? "" : "@LIGHTID" + ","; + values+= tmpObj._flowNo == null ? "" : "@FLOWNO" + ","; values+= tmpObj._partionName == null ? "" : "@PARTIONNAME" + ","; values+= tmpObj._mem == null ? "" : "@MEM" + ","; values+= tmpObj._portNo == null ? "" : "@PORTNO" + ","; @@ -328,6 +368,14 @@ namespace DeiNiu.wms.Data.Model { updateFields +="CUSTNAME = @CUSTNAME," ; } + if (tmpObj._lightId !=null && tmpObj._lightId != tmpObj._OlightId) + { + updateFields +="LIGHTID = @LIGHTID," ; + } + if (tmpObj._flowNo !=null && tmpObj._flowNo != tmpObj._OflowNo) + { + updateFields +="FLOWNO = @FLOWNO," ; + } if (tmpObj._partionName !=null && tmpObj._partionName != tmpObj._OpartionName) { updateFields +="PARTIONNAME = @PARTIONNAME," ; @@ -374,6 +422,8 @@ namespace DeiNiu.wms.Data.Model oraCmd.Parameters.AddWithValue("@DESKID", VerifyDbnull(tmpObj._deskId)) ; oraCmd.Parameters.AddWithValue("@CUSTID", VerifyDbnull(tmpObj._custid)) ; oraCmd.Parameters.AddWithValue("@CUSTNAME", VerifyDbnull(tmpObj._custName)) ; + oraCmd.Parameters.AddWithValue("@LIGHTID", VerifyDbnull(tmpObj._lightId)) ; + oraCmd.Parameters.AddWithValue("@FLOWNO", VerifyDbnull(tmpObj._flowNo)) ; oraCmd.Parameters.AddWithValue("@PARTIONNAME", VerifyDbnull(tmpObj._partionName)) ; oraCmd.Parameters.AddWithValue("@MEM", VerifyDbnull(tmpObj._mem)) ; oraCmd.Parameters.AddWithValue("@PORTNO", VerifyDbnull(tmpObj._portNo)) ; @@ -389,6 +439,10 @@ namespace DeiNiu.wms.Data.Model oraCmd.Parameters.AddWithValue("@CUSTID", VerifyDbnull(tmpObj._custid)) ; if(tmpObj._custName!=null) oraCmd.Parameters.AddWithValue("@CUSTNAME", VerifyDbnull(tmpObj._custName)) ; + if(tmpObj._lightId!=null) + oraCmd.Parameters.AddWithValue("@LIGHTID", VerifyDbnull(tmpObj._lightId)) ; + if(tmpObj._flowNo!=null) + oraCmd.Parameters.AddWithValue("@FLOWNO", VerifyDbnull(tmpObj._flowNo)) ; if(tmpObj._partionName!=null) oraCmd.Parameters.AddWithValue("@PARTIONNAME", VerifyDbnull(tmpObj._partionName)) ; if(tmpObj._mem!=null) diff --git a/WcfService1/wcfData/wcfWmsDeskCustomer.cs b/WcfService1/wcfData/wcfWmsDeskCustomer.cs index e50e00e..bfb01e1 100644 --- a/WcfService1/wcfData/wcfWmsDeskCustomer.cs +++ b/WcfService1/wcfData/wcfWmsDeskCustomer.cs @@ -2,7 +2,7 @@ ///WCF Data Object ///BASIC CLASS FOR TABLE t_wmsDeskCustomer ///By wm -///on 03/21/2024 +///on 05/27/2024 /// using System; @@ -22,8 +22,10 @@ namespace DeiNiu.Wcf internal int _id; internal int _partion; internal int _deskId; - internal int _custid; + internal string _custid= String.Empty; internal string _custName= String.Empty; + internal int _lightId; + internal string _flowNo= String.Empty; internal string _partionName= String.Empty; internal string _mem= String.Empty; internal int _portNo; @@ -53,12 +55,20 @@ namespace DeiNiu.Wcf } if (dr.Table.Columns.Contains("custid") && !(dr["custid"] is DBNull)) { - _custid = Convert.ToInt32(dr["custid"].ToString()); ; + _custid = dr["custid"].ToString() ; } if (dr.Table.Columns.Contains("custName") && !(dr["custName"] is DBNull)) { _custName = dr["custName"].ToString() ; } + if (dr.Table.Columns.Contains("lightId") && !(dr["lightId"] is DBNull)) + { + _lightId = Convert.ToInt32(dr["lightId"].ToString()); ; + } + if (dr.Table.Columns.Contains("flowNo") && !(dr["flowNo"] is DBNull)) + { + _flowNo = dr["flowNo"].ToString() ; + } if (dr.Table.Columns.Contains("partionName") && !(dr["partionName"] is DBNull)) { _partionName = dr["partionName"].ToString() ; @@ -103,6 +113,10 @@ namespace DeiNiu.Wcf custName = dbObj.custName; + lightId = dbObj.lightId; + + flowNo = dbObj.flowNo; + partionName = dbObj.partionName; mem = dbObj.mem; @@ -141,7 +155,7 @@ namespace DeiNiu.Wcf [DataMember] - public int custid{ + public string custid{ get {return _custid;} set {_custid = value;} } @@ -154,6 +168,20 @@ namespace DeiNiu.Wcf } + [DataMember] + public int lightId{ + get {return _lightId;} + set {_lightId = value;} + } + + + [DataMember] + public string flowNo{ + get {return _flowNo;} + set {_flowNo = value;} + } + + [DataMember] public string partionName{ get {return _partionName;} @@ -217,6 +245,10 @@ namespace DeiNiu.Wcf dbObj.custName = custName; + dbObj.lightId = lightId; + + dbObj.flowNo = flowNo; + dbObj.partionName = partionName; dbObj.mem = mem; @@ -243,6 +275,10 @@ namespace DeiNiu.Wcf wcfObj.custName = dbObj.custName; + wcfObj.lightId = dbObj.lightId; + + wcfObj.flowNo = dbObj.flowNo; + wcfObj.partionName = dbObj.partionName; wcfObj.mem = dbObj.mem;