From cb62fe00ff0c80bce983b0aa7a2b320fdc26f85f Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期一, 20 五月 2024 08:51:03 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong --- 代码管理/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs | 138 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 2 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs" index d8a0556..9782528 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs" @@ -26,11 +26,145 @@ /// <summary> /// 浠诲姟绛夌骇 /// </summary> - public int? Grade { get; set; } + public int? Grade { get; set; } = 0; /// <summary> /// 鏁伴噺 /// </summary> - public int? Quantity { get; set; } + public int Quantity { get; set; } + + ///<summary> + /// 杞繍鎵樼洏鏃讹紝璧风偣搴曢儴鍑犱釜鎵樼洏锛屽叆鍫嗗彔瀹屽叏閮ㄨ浆杩愬垯涓�0锛屽鏋滆浆杩愪簲灞備笂鐨勪竴涓垯涓�4锛屼笂闈㈡暟閲忓垯涓�1 + ///</summary> + public int StarQuantity { get; set; } + + ///<summary> + /// 杞繍鎵樼洏鏃讹紝缁堢偣搴曢儴鍑犱釜鎵樼洏锛屽叆鍫嗗彔瀹屽叏閮ㄨ浆杩愬垯涓�0锛屽鏋滆浆杩愪簲灞備笂鐨勪竴涓垯涓�4锛屼笂闈㈡暟閲忓垯涓�1 + ///</summary> + public int EndQuantity { get; set; } + /// <summary> + /// 鎵樼洏绫诲瀷 1灏忔墭鐩橈紝2澶ф墭鐩� + /// </summary> + public int TrayType { get; set; } + /// <summary> + /// 浠诲姟绫诲瀷 1杞繍杞﹁疆浠诲姟锛�2杞繍绌烘墭鐩樹换鍔� + /// </summary> + public int TaskType { get; set; } + /// <summary> + /// 鐗╂枡淇℃伅 + /// </summary> + public string Material { get; set; } + #region 杞﹁疆鏁版嵁 + public float A { get; set; } + public float B { get; set; } + public float C { get; set; } + public float D { get; set; } + public float E { get; set; } + public float F { get; set; } + public float G { get; set; } + public float H { get; set; } + #endregion + } + /// <summary> + /// 璧风偣浠诲姟涓嬪彂淇℃伅 + /// </summary> + public class RequestFromTask + { + /// <summary> + /// 浣滀笟浠诲姟鍙� + /// </summary> + public string TASK_NO { get; set; } + /// <summary> + /// 璧风偣 + /// </summary> + public string FROM_POSITION { get; set; } + /// <summary> + /// 缁堢偣 + /// </summary> + //public string TO_POSITION { get; set; } + /// <summary> + /// 浠诲姟绛夌骇 + /// </summary> + public int? Grade { get; set; } = 0; + /// <summary> + /// 鏁伴噺 + /// </summary> + public int Quantity { get; set; } + + ///<summary> + /// 杞繍鎵樼洏鏃讹紝璧风偣搴曢儴鍑犱釜鎵樼洏锛屽叆鍫嗗彔瀹屽叏閮ㄨ浆杩愬垯涓�0锛屽鏋滆浆杩愪簲灞備笂鐨勪竴涓垯涓�4锛屼笂闈㈡暟閲忓垯涓�1 + ///</summary> + public int StarQuantity { get; set; } + + ///<summary> + /// 杞繍鎵樼洏鏃讹紝缁堢偣搴曢儴鍑犱釜鎵樼洏锛屽叆鍫嗗彔瀹屽叏閮ㄨ浆杩愬垯涓�0锛屽鏋滆浆杩愪簲灞備笂鐨勪竴涓垯涓�4锛屼笂闈㈡暟閲忓垯涓�1 + ///</summary> + public int EndQuantity { get; set; } + /// <summary> + /// 鎵樼洏绫诲瀷 1灏忔墭鐩橈紝2澶ф墭鐩� + /// </summary> + public int TrayType { get; set; } + /// <summary> + /// 浠诲姟绫诲瀷 1杞繍杞﹁疆浠诲姟锛�2杞繍绌烘墭鐩樹换鍔� + /// </summary> + public int TaskType { get; set; } + /// <summary> + /// 鐗╂枡淇℃伅 + /// </summary> + public string Material { get; set; } + #region 杞﹁疆鏁版嵁 + public float A { get; set; } + public float B { get; set; } + public float C { get; set; } + public float D { get; set; } + public float E { get; set; } + public float F { get; set; } + public float G { get; set; } + public float H { get; set; } + #endregion + } + /// <summary> + /// 缁堢偣浠诲姟涓嬪彂淇℃伅 + /// </summary> + public class RequestToaddTask + { + /// <summary> + /// 浣滀笟浠诲姟鍙� + /// </summary> + public string TASK_NO { get; set; } + /// <summary> + /// 璧风偣 + /// </summary> + //public string FROM_POSITION { get; set; } + /// <summary> + /// 缁堢偣 + /// </summary> + public string TO_POSITION { get; set; } + /// <summary> + /// 浠诲姟绛夌骇 + /// </summary> + public int? Grade { get; set; } = 0; + /// <summary> + /// 鏁伴噺 + /// </summary> + public int Quantity { get; set; } + + ///<summary> + /// 杞繍鎵樼洏鏃讹紝璧风偣搴曢儴鍑犱釜鎵樼洏锛屽叆鍫嗗彔瀹屽叏閮ㄨ浆杩愬垯涓�0锛屽鏋滆浆杩愪簲灞備笂鐨勪竴涓垯涓�4锛屼笂闈㈡暟閲忓垯涓�1 + ///</summary> + public int StarQuantity { get; set; } + + ///<summary> + /// 杞繍鎵樼洏鏃讹紝缁堢偣搴曢儴鍑犱釜鎵樼洏锛屽叆鍫嗗彔瀹屽叏閮ㄨ浆杩愬垯涓�0锛屽鏋滆浆杩愪簲灞備笂鐨勪竴涓垯涓�4锛屼笂闈㈡暟閲忓垯涓�1 + ///</summary> + public int EndQuantity { get; set; } + /// <summary> + /// 鎵樼洏绫诲瀷 1灏忔墭鐩橈紝2澶ф墭鐩� + /// </summary> + public int TrayType { get; set; } + /// <summary> + /// 浠诲姟绫诲瀷 1杞繍杞﹁疆浠诲姟锛�2杞繍绌烘墭鐩樹换鍔� + /// </summary> + public int TaskType { get; set; } /// <summary> /// 鐗╂枡淇℃伅 /// </summary> -- Gitblit v1.9.3