From f978872b6de4e7e20d992a2ee7cda902c11347b9 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期一, 30 六月 2025 15:31:56 +0800 Subject: [PATCH] 优化配置文件读取逻辑,将ERP反馈接口写入配置文件中配置 --- api/ApiModel.cs | 852 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 811 insertions(+), 41 deletions(-) diff --git a/api/ApiModel.cs b/api/ApiModel.cs index 30b6b23..57560c4 100644 --- a/api/ApiModel.cs +++ b/api/ApiModel.cs @@ -206,7 +206,7 @@ public string StartLoc { get; set; } } /// <summary> - /// 绌虹涓婄嚎淇℃伅 + /// 绌烘墭涓婄嚎淇℃伅 /// </summary> public class EmptyOnlinePalletInfo { /// <summary> @@ -260,7 +260,17 @@ /// <summary> /// 涓嶅悎鏍肩Щ搴撴暟鎹被 /// </summary> - public class UnqualifiedShiftInfo : QualifiedBackInfo { + public class UnqualifiedShiftInfo { + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [JsonProperty("item_code")] + public string ItemCode { get; set; } + /// <summary> + /// 瀹瑰櫒缂栫爜 + /// </summary> + [JsonProperty("cntr_code")] + public string CntrCode { get; set; } /// <summary> /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖猴紙蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖猴級 /// </summary> @@ -339,24 +349,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涓笅绾胯揣浣嶏紝杩欓噷鏆傚畾涓猴細3鍜�锛�+ ///// </summary> + //[JsonProperty("prodLineId")] + //public string ProdLineId { get; set; } } /// <summary> @@ -382,6 +404,13 @@ public string Data { get; set; } } + /// <summary> + /// 浠呭綋 Code = 0 琛ㄧず鎴愬姛 + /// </summary> + /// <param name="code"></param> + /// <param name="message"></param> + /// <param name="printLog"></param> + /// <returns></returns> public static MesResult NewMesResult(int code, string message = "", bool printLog = true) { return new MesResult { Result = code, @@ -407,49 +436,790 @@ /// <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