From 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期一, 21 七月 2025 17:27:34 +0800 Subject: [PATCH] 优化代码, 封装货位锁和创建任务流程, 数据库事务等 --- api/ApiModel.cs | 897 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 836 insertions(+), 61 deletions(-) diff --git a/api/ApiModel.cs b/api/ApiModel.cs index 30b6b23..cd2647e 100644 --- a/api/ApiModel.cs +++ b/api/ApiModel.cs @@ -4,6 +4,8 @@ using System.Text; using System.Threading.Tasks; +using HH.WCS.Mobox3.DSZSH.util; + using Newtonsoft.Json; namespace HH.WCS.Mobox3.DSZSH.api { @@ -17,14 +19,14 @@ public List<object> result { get; set; } = new List<object>(); } - /// <summary> - /// 鏋勫缓 <see cref="SimpleResult"/> 杩斿洖鍊�- /// </summary> - /// <param name="code"></param> - /// <param name="message"></param> - /// <returns></returns> - public static SimpleResult NewSimpleResult(int code, string message) { + public static SimpleResult NewSimpleResult(int code, string message, string name = "") { + LogHelper.Info(message, name); return new SimpleResult { resultCode = code, resultMsg = message }; + } + + public static SimpleResult NewSimpleResult(Exception ex, string preLog = "", int errCode = -1) { + LogHelper.InfoEx(ex, preLog); + return new SimpleResult { resultCode = errCode, resultMsg = $"鍙戠敓浜哰寮傚父]:{ex.Message}" }; } /// <summary> @@ -58,7 +60,7 @@ //public int station_id { get; set; } /// <summary> - /// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О锛屼緥濡倃ork6銆亀ork8 + /// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О,渚嬪work6,work8 /// </summary> public string station_name { get; set; } @@ -77,7 +79,8 @@ public string ResultMsg { get; set; } } - public static ReturnResult NewReturnResult(int code, string message) { + public static ReturnResult NewReturnResult(int code, string message, bool log = true) { + if (log) { LogHelper.Info(message); } return new ReturnResult { ResultCode = code, ResultMsg = message }; } @@ -150,7 +153,7 @@ public class OtherModel { /// <summary> - /// 濂借繍绠�婊$涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+ /// 婊$涓嬬嚎鍏ュ簱 /// </summary> public class GoodpackOfflineInfo { /// <summary> @@ -174,7 +177,7 @@ [JsonProperty("n_num")] public int Num { get; set; } /// <summary> - /// 璧风偣璐т綅淇℃伅锛堣捣鐐硅揣浣嶈揣鍖鸿姹傦細MXCZQ 婊$鎿嶄綔鍖猴級 + /// 璧风偣璐т綅淇℃伅 (璧风偣璐т綅璐у尯瑕佹眰:MXCZQ 婊$鎿嶄綔鍖� /// </summary> [JsonProperty("s_start_loc")] public string StartLoc { get; set; } @@ -190,23 +193,23 @@ [JsonProperty("cntr_code")] public string CntrCode { get; set; } /// <summary> - /// 瀹瑰櫒绫诲瀷锛堝繀椤讳负 '绌烘墭鐩樷� 鎴�鈥樼┖濂借繍绠�锛�+ /// 瀹瑰櫒绫诲瀷 (蹇呴』涓�'绌烘墭鐩樷� 鎴�鈥樼┖濂借繍绠�) /// </summary> [JsonProperty("cntr_type")] public string CntrType { get; set; } /// <summary> - /// 缁堢偣搴撳尯缂栫爜锛堟墭鐩樻槸 KTCFQ 绌烘墭瀛樻斁鍖猴紱濂借繍绠辨槸 CXHJQ 绌虹璐ф灦鍖猴級 + /// 缁堢偣搴撳尯缂栫爜 (鎵樼洏鏄�KTCFQ 绌烘墭瀛樻斁鍖�濂借繍绠辨槸 CXHJQ 绌虹璐ф灦鍖� /// </summary> [JsonProperty("end_area")] public string EndArea { get; set; } /// <summary> - /// 璧风偣璐т綅锛堟墭鐩樻槸 KTJBQ 绌烘墭鍏ュ簱鎺ラ┏鍖猴紱濂借繍绠辨槸 KXJBQ 绌虹鍏ュ簱鎺ラ┏鍖猴級 + /// 璧风偣璐т綅 (鎵樼洏鏄�KTJBQ 绌烘墭鍏ュ簱鎺ラ┏鍖�濂借繍绠辨槸 KXJBQ 绌虹鍏ュ簱鎺ラ┏鍖� /// </summary> [JsonProperty("start_loc")] public string StartLoc { get; set; } } /// <summary> - /// 绌虹涓婄嚎淇℃伅 + /// 绌烘墭涓婄嚎淇℃伅 /// </summary> public class EmptyOnlinePalletInfo { /// <summary> @@ -260,9 +263,19 @@ /// <summary> /// 涓嶅悎鏍肩Щ搴撴暟鎹被 /// </summary> - public class UnqualifiedShiftInfo : QualifiedBackInfo { + public class UnqualifiedShiftInfo { /// <summary> - /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖猴紙蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖猴級 + /// 鐗╂枡缂栫爜 + /// </summary> + [JsonProperty("item_code")] + public string ItemCode { get; set; } + /// <summary> + /// 瀹瑰櫒缂栫爜 + /// </summary> + [JsonProperty("cntr_code")] + public string CntrCode { get; set; } + /// <summary> + /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖�(蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖� /// </summary> [JsonProperty("end_area")] public string EndArea { get; set; } @@ -339,24 +352,36 @@ /// </summary> [JsonProperty("batchNo")] public string BatchNo { get; set; } - /// <summary> /// 鎵ц鏍囧噯 /// </summary> [JsonProperty("standard")] public string Standard { get; set; } - /// <summary> /// 鍑�惈閲� /// </summary> [JsonProperty("netWeight")] public string NetWeight { get; set; } - /// <summary> /// 璐ㄩ噺绛夌骇 /// </summary> [JsonProperty("qualityGrade")] public string QualityGrade { get; set; } + /// <summary> + /// 鏂欑缂栧彿 (寰呭畾) + /// </summary> + [JsonProperty("cntrCode")] + public string CntrCode { get; set; } + /// <summary> + /// 鐗╂枡鏁伴噺 (寰呭畾) + /// </summary> + [JsonProperty("itemNum")] + public int ItemNum { get; set; } + ///// <summary> + ///// 浜х嚎鍙�(寰呭畾,濂借繍绠辨湁2鏉′骇绾�瀵瑰簲2涓笅绾胯揣浣�杩欓噷鏆傚畾涓�3鍜�) + ///// </summary> + //[JsonProperty("prodLineId")] + //public string ProdLineId { get; set; } } /// <summary> @@ -370,22 +395,30 @@ public int Result { get; set; } /// <summary> - /// 鏄惁鎴愬姛 True-鎴愬姛锛孎alse锛氬け璐�+ /// 鏄惁鎴愬姛 True-鎴愬姛,False:澶辫触 /// </summary> [JsonProperty("success")] public bool Success { get; set; } /// <summary> - /// 杩欓噷鏄痵tring绫诲瀷锛屽缁撴灉鐨勬弿杩�+ /// 杩欓噷鏄痵tring绫诲瀷,瀵圭粨鏋滅殑鎻忚堪 /// </summary> [JsonProperty("data")] public string Data { get; set; } } - public static MesResult NewMesResult(int code, string message = "", bool printLog = true) { + /// <summary> + /// 浠呭綋 Code = 0 琛ㄧず鎴愬姛 + /// </summary> + /// <param name="code"></param> + /// <param name="message"></param> + /// <param name="log"></param> + /// <returns></returns> + public static MesResult NewMesResult(int code, string message = "", bool log = true) { + if (log) { LogHelper.Info(message); } return new MesResult { Result = code, - Success = code == 0, // 浠呭綋code=0鏃讹紝success=true + Success = code == 0, // 浠呭綋code=0鏃�success=true Data = message, }; } @@ -400,56 +433,798 @@ public string Message { get; set; } } - public static ErpResult NewErpResult(int code, string message) { + public static ErpResult NewErpResult(int code, string message, bool log = true) { + if (log) { LogHelper.Info(message); } return new ErpResult { Code = code, Message = message }; } /// <summary> /// ERP 涓嬪彂鍑哄簱浠诲姟鐨勬暟鎹被鍨� /// </summary> - public class ErpSendOutboundOrderInfo { - public string ErpNo { get; set; } // ERP 鍗曞彿 + public class ErpSendOutboundPlanInfo { /// <summary> - /// 鐗╂枡缂栫爜 + /// 璁″垝鍗曞彿 (鍞竴鏍囪瘑) /// </summary> - [JsonProperty("item_code")] - public string ItemCode { get; set; } - /// <summary> - /// 鐗╂枡瑙勬牸 - /// </summary> - [JsonProperty("spe")] - public string Spe { get; set; } - /// <summary> - /// 鎵规鍙�- /// </summary> - [JsonProperty("batch_no")] - public string BatchNo { get; set; } - /// <summary> - /// 闇�嚭搴撴暟閲�- /// </summary> - [JsonProperty("qty")] - public int Qty { get; set; } - /// <summary> - /// 瀹瑰櫒绫诲瀷 - /// </summary> - [JsonProperty("cntr_type")] - public string CntrType { get; set; } - /// <summary> - /// 鍑哄簱缁堢偣璐у尯 - /// </summary> - [JsonProperty("end_area")] - public string EndArea { get; set; } - /// <summary> - /// 鏄惁寮哄埗鍑哄簱 - /// </summary> - [JsonProperty("force_out")] - public bool ForcedOut { get; set; } + public string jhdh { get; set; } = string.Empty; + /// <summary> + /// 鍑哄簱鐘舵� + /// </summary> + public string ckzt { get; set; } = string.Empty;// 闇�杩斿洖 + + /// <summary> + /// 璁″垝绫诲埆 + /// </summary> + public string jhlb { get; set; } = string.Empty; + + /// <summary> + /// 鍙傝�鍗曞彿 + /// </summary> + public string ckdh { get; set; } = string.Empty; + + /// <summary> + /// 杞︾墝鍙�+ /// </summary> + public string cph { get; set; } = string.Empty; + + /// <summary> + /// 杩愯緭鏂瑰紡 + /// </summary> + public string ysfs { get; set; } = string.Empty; + + /// <summary> + /// 浜у搧鐘舵� + /// </summary> + public string cpzt { get; set; } = string.Empty; + + /// <summary> + /// 涔版柇鍗曚綅 + /// </summary> + public string mddw { get; set; } = string.Empty; + + /// <summary> + /// 浜у搧浠g爜 + /// </summary> + public string cpdm { get; set; } = string.Empty; + + /// <summary> + /// 浜у搧绫诲埆 + /// </summary> + public string cplb { get; set; } = string.Empty; + + /// <summary> + /// 浜у搧绫诲埆鏄庣粏 + /// </summary> + public string cplbmx { get; set; } = string.Empty; + + /// <summary> + /// 鍝佺墝 + /// </summary> + public string pp { get; set; } = string.Empty; + + /// <summary> + /// 绛夌骇 + /// </summary> + public string dj { get; set; } = string.Empty;// 闇�杩斿洖 + + /// <summary> + /// 缃愬彿 + /// </summary> + public string gh { get; set; } = string.Empty; + + /// <summary> + /// 鎵瑰彿 + /// </summary> + public string ph { get; set; } = string.Empty;// 闇�杩斿洖 + + /// <summary> + /// 鍖呰绫诲瀷 + /// </summary> + public string bzlx { get; set; } = string.Empty; + + /// <summary> + /// 娲捐鍗曞彿 + /// </summary> + public string pzdh { get; set; } = string.Empty; + + /// <summary> + /// 娲捐鍗曞崟浣�+ /// </summary> + public string pzd_dw { get; set; } = string.Empty; + + /// <summary> + /// 娲捐鍗曡皟杩愮紪鍙�+ /// </summary> + public string pzd_dybh { get; set; } = string.Empty; + + /// <summary> + /// 娲捐浠舵暟 + /// </summary> + public double pzjs { get; set; } = 0; + + /// <summary> + /// 娲捐鏁伴噺 + /// </summary> + public decimal pzsl { get; set; } = 0; + + /// <summary> + /// 娲捐鏃ユ湡(yyyy-mm-dd) + /// </summary> + public string pz_rq { get; set; } = string.Empty; + + /// <summary> + /// 娲捐鎿嶄綔鏃ユ湡 + /// </summary> + public long pz_czrq { get; set; } = 0; + + /// <summary> + /// 娲捐浣滃簾鏍囪 + /// </summary> + public int pz_zfbj { get; set; } = 0; + + /// <summary> + /// 娲捐浣滃簾鏃ユ湡 + /// </summary> + public long pz_zfrq { get; set; } = 0; + + /// <summary> + /// 娲捐澶囨敞 + /// </summary> + public string pz_bz { get; set; } = string.Empty; + + /// <summary> + /// 鍑哄簱鍗曠紪鍙�+ /// </summary> + public string ckdbh { get; set; } = string.Empty; + + /// <summary> + /// 瀹炲彂浠舵暟 + /// </summary> + public double sfjs { get; set; } = 0; // 闇�杩斿洖 + + /// <summary> + /// 瀹炲彂鏁伴噺 + /// </summary> + public decimal sfsl { get; set; } = 0; // 闇�杩斿洖 + + /// <summary> + /// 瀹炲彂杞︽暟 + /// </summary> + public int sfcs { get; set; } = 0; // 闇�杩斿洖 + + /// <summary> + /// 瑁呰溅鏃堕棿 + /// </summary> + public string zcsj { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// 璁¢噺鍗曚綅 + /// </summary> + public string jldw { get; set; } = string.Empty;// 闇�杩斿洖 + + /// <summary> + /// 鍙戣揣鏃ユ湡 + /// </summary> + public long fhrq { get; set; } = 0; // 闇�杩斿洖 + + /// <summary> + /// 浠撳簱浠g爜 + /// </summary> + public string ckdm { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// 鍙戣揣浜�+ /// </summary> + public string fhr { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// 鎿嶄綔鍛�+ /// </summary> + public string czydm { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// 瀹℃牳浜�+ /// </summary> + public string shr_username { get; set; } = string.Empty; + + /// <summary> + /// 瀹℃牳鏃ユ湡 + /// </summary> + public long shrq { get; set; } = 0; + + /// <summary> + /// 浣滃簾鏍囪 + /// </summary> + public long zfbj { get; set; } = 0; + + /// <summary> + /// 浣滃簾鏃ユ湡 + /// </summary> + public long zfrq { get; set; } = 0; + + /// <summary> + /// 缁撶畻鍗曚綅 + /// </summary> + public string jsdw { get; set; } = string.Empty; + + /// <summary> + /// 鏀惰揣鍗曚綅 + /// </summary> + public string shdw { get; set; } = string.Empty; + + /// <summary> + /// 杩愯緭鍗曚綅 + /// </summary> + public string ysdw { get; set; } = string.Empty; + + /// <summary> + /// 鑱旂郴浜�+ /// </summary> + public string lxr { get; set; } = string.Empty; + + /// <summary> + /// 瑁呭嵏宸�+ /// </summary> + public string ry_zxg { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// 鍙夎溅鍙告満 + /// </summary> + public string ry_ccsj { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// erp浜よ揣鍗曞彿 + /// </summary> + public string erphx_jhdh { get; set; } = string.Empty; + + /// <summary> + /// erp鐗╂枡缂栫爜 + /// </summary> + public string erphx_wlbm { get; set; } = string.Empty; + + /// <summary> + /// erp鐗╂枡鍚嶇О + /// </summary> + public string erphx_wlmc { get; set; } = string.Empty; + + /// <summary> + /// erp鍒涘缓鏃ユ湡 + /// </summary> + public string erphx_cjrq { get; set; } = string.Empty; + + /// <summary> + /// 璐т綅 + /// </summary> + public string hw { get; set; } = string.Empty; // 闇�杩斿洖 + + /// <summary> + /// 璐т綅鐘舵� + /// </summary> + public string hwzt { get; set; } = string.Empty; // 闇�杩斿洖 } public class PickUpReturnErpInfo { - public string LocCode { get; set; } + /// <summary> + /// 璁″垝鍗曞彿 (鍞竴鏍囪瘑) + /// </summary> + public string jhdh { get; set; } + /// <summary> + /// 鍑哄簱鐘舵� + /// </summary> + public string ckzt { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 璁″垝绫诲埆 + /// </summary> + public string jhlb { get; set; } + + /// <summary> + /// 鍙傝�鍗曞彿 + /// </summary> + public string ckdh { get; set; } + + /// <summary> + /// 杞︾墝鍙�+ /// </summary> + public string cph { get; set; } + + /// <summary> + /// 杩愯緭鏂瑰紡 + /// </summary> + public string ysfs { get; set; } + + /// <summary> + /// 浜у搧鐘舵� + /// </summary> + public string cpzt { get; set; } + + /// <summary> + /// 涔版柇鍗曚綅 + /// </summary> + public string mddw { get; set; } + + /// <summary> + /// 浜у搧浠g爜 + /// </summary> + public string cpdm { get; set; } + + /// <summary> + /// 浜у搧绫诲埆 + /// </summary> + public string cplb { get; set; } + + /// <summary> + /// 浜у搧绫诲埆鏄庣粏 + /// </summary> + public string cplbmx { get; set; } + + /// <summary> + /// 鍝佺墝 + /// </summary> + public string pp { get; set; } + + /// <summary> + /// 绛夌骇 + /// </summary> + public string dj { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 缃愬彿 + /// </summary> + public string gh { get; set; } + + /// <summary> + /// 鎵瑰彿 + /// </summary> + public string ph { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 鍖呰绫诲瀷 + /// </summary> + public string bzlx { get; set; } + + /// <summary> + /// 娲捐鍗曞彿 + /// </summary> + public string pzdh { get; set; } + + /// <summary> + /// 娲捐鍗曞崟浣�+ /// </summary> + public string pzd_dw { get; set; } + + /// <summary> + /// 娲捐鍗曡皟杩愮紪鍙�+ /// </summary> + public string pzd_dybh { get; set; } + + /// <summary> + /// 娲捐浠舵暟 + /// </summary> + public double pzjs { get; set; } + + /// <summary> + /// 娲捐鏁伴噺 + /// </summary> + public decimal pzsl { get; set; } + + /// <summary> + /// 娲捐鏃ユ湡(yyyy-mm-dd) + /// </summary> + public string pz_rq { get; set; } + + /// <summary> + /// 娲捐鎿嶄綔鏃ユ湡 + /// </summary> + public long pz_czrq { get; set; } + + /// <summary> + /// 娲捐浣滃簾鏍囪 + /// </summary> + public int pz_zfbj { get; set; } + + /// <summary> + /// 娲捐浣滃簾鏃ユ湡 + /// </summary> + public long pz_zfrq { get; set; } + + /// <summary> + /// 娲捐澶囨敞 + /// </summary> + public string pz_bz { get; set; } + + /// <summary> + /// 鍑哄簱鍗曠紪鍙�+ /// </summary> + public string ckdbh { get; set; } + + /// <summary> + /// 瀹炲彂浠舵暟 + /// </summary> + public double sfjs { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 瀹炲彂鏁伴噺 + /// </summary> + public decimal sfsl { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 瀹炲彂杞︽暟 + ///// </summary> + //public int sfcs { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 瑁呰溅鏃堕棿 + ///// </summary> + //public string zcsj { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 璁¢噺鍗曚綅 + ///// </summary> + //public string jldw { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鍙戣揣鏃ユ湡 + ///// </summary> + //public long fhrq { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 浠撳簱浠g爜 + ///// </summary> + //public string ckdm { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鍙戣揣浜�+ ///// </summary> + //public string fhr { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鎿嶄綔鍛�+ ///// </summary> + //public string czydm { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 瀹℃牳浜�+ /// </summary> + public string shr_username { get; set; } + + /// <summary> + /// 瀹℃牳鏃ユ湡 + /// </summary> + public long shrq { get; set; } + + /// <summary> + /// 浣滃簾鏍囪 + /// </summary> + public long zfbj { get; set; } + + /// <summary> + /// 浣滃簾鏃ユ湡 + /// </summary> + public long zfrq { get; set; } + + /// <summary> + /// 缁撶畻鍗曚綅 + /// </summary> + public string jsdw { get; set; } + + /// <summary> + /// 鏀惰揣鍗曚綅 + /// </summary> + public string shdw { get; set; } + + /// <summary> + /// 杩愯緭鍗曚綅 + /// </summary> + public string ysdw { get; set; } + + /// <summary> + /// 鑱旂郴浜�+ /// </summary> + public string lxr { get; set; } + + ///// <summary> + ///// 瑁呭嵏宸�+ ///// </summary> + //public string ry_zxg { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鍙夎溅鍙告満 + ///// </summary> + //public string ry_ccsj { get; set; } // 闇�杩斿洖 + + /// <summary> + /// erp浜よ揣鍗曞彿 + /// </summary> + public string erphx_jhdh { get; set; } + + /// <summary> + /// erp鐗╂枡缂栫爜 + /// </summary> + public string erphx_wlbm { get; set; } + + /// <summary> + /// erp鐗╂枡鍚嶇О + /// </summary> + public string erphx_wlmc { get; set; } + + /// <summary> + /// erp鍒涘缓鏃ユ湡 + /// </summary> + public string erphx_cjrq { get; set; } + + /// <summary> + /// 璐т綅 + /// </summary> + public string hw { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 璐т綅鐘舵� + /// </summary> + public string hwzt { get; set; } // 闇�杩斿洖 + } + + public class CreateTaskReturnErpInfo { + /// <summary> + /// 璁″垝鍗曞彿 (鍞竴鏍囪瘑) + /// </summary> + public string jhdh { get; set; } + + /// <summary> + /// 鍑哄簱鐘舵� + /// </summary> + public string ckzt { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 璁″垝绫诲埆 + /// </summary> + public string jhlb { get; set; } + + /// <summary> + /// 鍙傝�鍗曞彿 + /// </summary> + public string ckdh { get; set; } + + /// <summary> + /// 杞︾墝鍙�+ /// </summary> + public string cph { get; set; } + + /// <summary> + /// 杩愯緭鏂瑰紡 + /// </summary> + public string ysfs { get; set; } + + /// <summary> + /// 浜у搧鐘舵� + /// </summary> + public string cpzt { get; set; } + + /// <summary> + /// 涔版柇鍗曚綅 + /// </summary> + public string mddw { get; set; } + + /// <summary> + /// 浜у搧浠g爜 + /// </summary> + public string cpdm { get; set; } + + /// <summary> + /// 浜у搧绫诲埆 + /// </summary> + public string cplb { get; set; } + + /// <summary> + /// 浜у搧绫诲埆鏄庣粏 + /// </summary> + public string cplbmx { get; set; } + + /// <summary> + /// 鍝佺墝 + /// </summary> + public string pp { get; set; } + + /// <summary> + /// 绛夌骇 + /// </summary> + public string dj { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 缃愬彿 + /// </summary> + public string gh { get; set; } + + /// <summary> + /// 鎵瑰彿 + /// </summary> + public string ph { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 鍖呰绫诲瀷 + /// </summary> + public string bzlx { get; set; } + + /// <summary> + /// 娲捐鍗曞彿 + /// </summary> + public string pzdh { get; set; } + + /// <summary> + /// 娲捐鍗曞崟浣�+ /// </summary> + public string pzd_dw { get; set; } + + /// <summary> + /// 娲捐鍗曡皟杩愮紪鍙�+ /// </summary> + public string pzd_dybh { get; set; } + + /// <summary> + /// 娲捐浠舵暟 + /// </summary> + public double pzjs { get; set; } + + /// <summary> + /// 娲捐鏁伴噺 + /// </summary> + public decimal pzsl { get; set; } + + /// <summary> + /// 娲捐鏃ユ湡(yyyy-mm-dd) + /// </summary> + public string pz_rq { get; set; } + + /// <summary> + /// 娲捐鎿嶄綔鏃ユ湡 + /// </summary> + public long pz_czrq { get; set; } + + /// <summary> + /// 娲捐浣滃簾鏍囪 + /// </summary> + public int pz_zfbj { get; set; } + + /// <summary> + /// 娲捐浣滃簾鏃ユ湡 + /// </summary> + public long pz_zfrq { get; set; } + + /// <summary> + /// 娲捐澶囨敞 + /// </summary> + public string pz_bz { get; set; } + + /// <summary> + /// 鍑哄簱鍗曠紪鍙�+ /// </summary> + public string ckdbh { get; set; } + + ///// <summary> + ///// 瀹炲彂浠舵暟 + ///// </summary> + //public double sfjs { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 瀹炲彂鏁伴噺 + ///// </summary> + //public decimal sfsl { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 瀹炲彂杞︽暟 + ///// </summary> + //public int sfcs { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 瑁呰溅鏃堕棿 + ///// </summary> + //public string zcsj { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 璁¢噺鍗曚綅 + ///// </summary> + //public string jldw { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鍙戣揣鏃ユ湡 + ///// </summary> + //public long fhrq { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 浠撳簱浠g爜 + ///// </summary> + //public string ckdm { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鍙戣揣浜�+ ///// </summary> + //public string fhr { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鎿嶄綔鍛�+ ///// </summary> + //public string czydm { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 瀹℃牳浜�+ /// </summary> + public string shr_username { get; set; } + + /// <summary> + /// 瀹℃牳鏃ユ湡 + /// </summary> + public long shrq { get; set; } + + /// <summary> + /// 浣滃簾鏍囪 + /// </summary> + public long zfbj { get; set; } + + /// <summary> + /// 浣滃簾鏃ユ湡 + /// </summary> + public long zfrq { get; set; } + + /// <summary> + /// 缁撶畻鍗曚綅 + /// </summary> + public string jsdw { get; set; } + + /// <summary> + /// 鏀惰揣鍗曚綅 + /// </summary> + public string shdw { get; set; } + + /// <summary> + /// 杩愯緭鍗曚綅 + /// </summary> + public string ysdw { get; set; } + + /// <summary> + /// 鑱旂郴浜�+ /// </summary> + public string lxr { get; set; } + + ///// <summary> + ///// 瑁呭嵏宸�+ ///// </summary> + //public string ry_zxg { get; set; } // 闇�杩斿洖 + + ///// <summary> + ///// 鍙夎溅鍙告満 + ///// </summary> + //public string ry_ccsj { get; set; } // 闇�杩斿洖 + + /// <summary> + /// erp浜よ揣鍗曞彿 + /// </summary> + public string erphx_jhdh { get; set; } + + /// <summary> + /// erp鐗╂枡缂栫爜 + /// </summary> + public string erphx_wlbm { get; set; } + + /// <summary> + /// erp鐗╂枡鍚嶇О + /// </summary> + public string erphx_wlmc { get; set; } + + /// <summary> + /// erp鍒涘缓鏃ユ湡 + /// </summary> + public string erphx_cjrq { get; set; } + + /// <summary> + /// 璐т綅 + /// </summary> + public string hw { get; set; } // 闇�杩斿洖 + + /// <summary> + /// 璐т綅鐘舵� + /// </summary> + public string hwzt { get; set; } // 闇�杩斿洖 } } } -- Gitblit v1.9.1