1

Property.Model/Entity/Supplies/RB_Supplies_StockOutApplyFor.cs

@@ -93,7 +93,7 @@ namespace Property.Model.Entity
         public DateTime? AuditDate { get; set; }
 
         /// <summary>
-        /// 类型  1主营业务   2其他业务
+        /// 类型  1主营业务   2其他业务   3约课订单
         /// </summary>
         public int Type { get; set; }
 

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -5762,7 +5762,7 @@ namespace Property.Module.FixedAssets
             if (oldModel.StockOutStatus == 3) { return "已出库完毕"; }
 
             RB_Finance_Config_ViewModel configModel = null;
-            if (oldModel.Type == 1) {
+            if (oldModel.Type == 1 || oldModel.Type == 3) {
                 configModel = finance_ConfigRepository.GetList(new RB_Finance_Config_ViewModel() { Group_Id = userInfo.RB_Group_id, Type = FinanceConfigTypeEnum.SuppliesStockOut }).FirstOrDefault();
             }
             else {
@@ -6004,7 +6004,8 @@ namespace Property.Module.FixedAssets
                         RB_Depart_Id = userInfo.RB_Department_Id,
                         ReFinanceId = StockOutId,
                         ReFinanceId2 = demodel.Id,
-                        TCIDList = classId > 0 ? new List<int>() { classId } : new List<int>(),
+                        OrderID = oldModel.Type == 3 ? classId : 0,
+                        TCIDList = oldModel.Type == 3 ? new List<int> { Convert.ToInt32(dmodel.CourseName) } : classId > 0 ? new List<int>() { classId } : new List<int>(),
                         FinanceType = 2,
                         RB_Group_Id = userInfo.RB_Group_id,
                         RB_CreateByName = userInfo.emName,

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -3839,7 +3839,23 @@ namespace Property.WebApi.Controllers.User
                         return ApiResult.ParamIsNull("请传递课程名称");
                     }
                 }
-                else {
+                else if (demodel.Type == 3) {
+                    if (item.ClassId <= 0)
+                    {
+                        return ApiResult.ParamIsNull("请传递关联订单ID");
+                    }
+                    if (string.IsNullOrEmpty(item.ClassName))
+                    {
+                        return ApiResult.ParamIsNull("请传递订单关联班级信息");
+                    }
+                    if (string.IsNullOrEmpty(item.CourseName))
+                    {
+                        return ApiResult.ParamIsNull("请传递班级classId");
+                    }
+                    item.ClassName = "相关订单：" + item.ClassId + " " + item.ClassName;
+                }
+                else
+                {
                     item.ClassId = 0;
                     item.ClassName = "";
                     item.CourseName = "";