zhupei 4 年之前
父节点
当前提交
db31d134b6

文件差异内容过多而无法显示
+ 88 - 78
RMYY_CallCenter_Api.Dal/T_Acc_WorkOrder.cs


+ 69 - 58
RMYY_CallCenter_Api.Dal/T_Car_WorkOrder.cs

@@ -41,13 +41,14 @@ namespace RMYY_CallCenter_Api.Dal
41 41
         {
42 42
             StringBuilder strSql = new StringBuilder();
43 43
             strSql.Append("insert into T_Car_WorkOrder(");
44
-            strSql.Append("F_WorkOrderCode,F_Type,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName)");
44
+            strSql.Append("F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName)");
45 45
             strSql.Append(" values (");
46
-            strSql.Append("@F_WorkOrderCode,@F_Type,@F_ProposerDeptId,@F_Source,@F_CallID,@F_DepartPlace,@F_Destination,@F_ProposerCode,@F_Phon,@F_CarType,@F_Remark,@F_CreateTime,@F_CarMessage,@F_DriverCode,@F_DriverPhon,@F_DepartTime,@F_DriverName,@F_ProposerName,@F_State,@F_IsDel,@F_DeleteBy,@F_DeleteTime,@F_CreateUser,@F_AssistMan,@F_IsAssist,@F_FinishTime,@F_CarId,@F_AssistManName)");
46
+            strSql.Append("@F_WorkOrderCode,@F_Type,@F_HosId,@F_ProposerDeptId,@F_Source,@F_CallID,@F_DepartPlace,@F_Destination,@F_ProposerCode,@F_Phon,@F_CarType,@F_Remark,@F_CreateTime,@F_CarMessage,@F_DriverCode,@F_DriverPhon,@F_DepartTime,@F_DriverName,@F_ProposerName,@F_State,@F_IsDel,@F_DeleteBy,@F_DeleteTime,@F_CreateUser,@F_AssistMan,@F_IsAssist,@F_FinishTime,@F_CarId,@F_AssistManName)");
47 47
             strSql.Append(";select @@IDENTITY");
48 48
             SqlParameter[] parameters = {
49 49
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
50 50
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
51
+                    new SqlParameter("@F_HosId", SqlDbType.Int,4),
51 52
                     new SqlParameter("@F_ProposerDeptId", SqlDbType.Int,4),
52 53
                     new SqlParameter("@F_Source", SqlDbType.NVarChar,200),
53 54
                     new SqlParameter("@F_CallID", SqlDbType.VarChar,50),
@@ -76,32 +77,33 @@ namespace RMYY_CallCenter_Api.Dal
76 77
                     new SqlParameter("@F_AssistManName", SqlDbType.VarChar,50)};
77 78
             parameters[0].Value = model.F_WorkOrderCode;
78 79
             parameters[1].Value = model.F_Type;
79
-            parameters[2].Value = model.F_ProposerDeptId;
80
-            parameters[3].Value = model.F_Source;
81
-            parameters[4].Value = model.F_CallID;
82
-            parameters[5].Value = model.F_DepartPlace;
83
-            parameters[6].Value = model.F_Destination;
84
-            parameters[7].Value = model.F_ProposerCode;
85
-            parameters[8].Value = model.F_Phon;
86
-            parameters[9].Value = model.F_CarType;
87
-            parameters[10].Value = model.F_Remark;
88
-            parameters[11].Value = model.F_CreateTime;
89
-            parameters[12].Value = model.F_CarMessage;
90
-            parameters[13].Value = model.F_DriverCode;
91
-            parameters[14].Value = model.F_DriverPhon;
92
-            parameters[15].Value = model.F_DepartTime;
93
-            parameters[16].Value = model.F_DriverName;
94
-            parameters[17].Value = model.F_ProposerName;
95
-            parameters[18].Value = model.F_State;
96
-            parameters[19].Value = model.F_IsDel;
97
-            parameters[20].Value = model.F_DeleteBy;
98
-            parameters[21].Value = model.F_DeleteTime;
99
-            parameters[22].Value = model.F_CreateUser;
100
-            parameters[23].Value = model.F_AssistMan;
101
-            parameters[24].Value = model.F_IsAssist;
102
-            parameters[25].Value = model.F_FinishTime;
103
-            parameters[26].Value = model.F_CarId;
104
-            parameters[27].Value = model.F_AssistManName;
80
+            parameters[2].Value = model.F_HosId;
81
+            parameters[3].Value = model.F_ProposerDeptId;
82
+            parameters[4].Value = model.F_Source;
83
+            parameters[5].Value = model.F_CallID;
84
+            parameters[6].Value = model.F_DepartPlace;
85
+            parameters[7].Value = model.F_Destination;
86
+            parameters[8].Value = model.F_ProposerCode;
87
+            parameters[9].Value = model.F_Phon;
88
+            parameters[10].Value = model.F_CarType;
89
+            parameters[11].Value = model.F_Remark;
90
+            parameters[12].Value = model.F_CreateTime;
91
+            parameters[13].Value = model.F_CarMessage;
92
+            parameters[14].Value = model.F_DriverCode;
93
+            parameters[15].Value = model.F_DriverPhon;
94
+            parameters[16].Value = model.F_DepartTime;
95
+            parameters[17].Value = model.F_DriverName;
96
+            parameters[18].Value = model.F_ProposerName;
97
+            parameters[19].Value = model.F_State;
98
+            parameters[20].Value = model.F_IsDel;
99
+            parameters[21].Value = model.F_DeleteBy;
100
+            parameters[22].Value = model.F_DeleteTime;
101
+            parameters[23].Value = model.F_CreateUser;
102
+            parameters[24].Value = model.F_AssistMan;
103
+            parameters[25].Value = model.F_IsAssist;
104
+            parameters[26].Value = model.F_FinishTime;
105
+            parameters[27].Value = model.F_CarId;
106
+            parameters[28].Value = model.F_AssistManName;
105 107
 
106 108
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
107 109
             if (obj == null)
@@ -122,6 +124,7 @@ namespace RMYY_CallCenter_Api.Dal
122 124
             strSql.Append("update T_Car_WorkOrder set ");
123 125
             strSql.Append("F_WorkOrderCode=@F_WorkOrderCode,");
124 126
             strSql.Append("F_Type=@F_Type,");
127
+            strSql.Append("F_HosId=@F_HosId,");
125 128
             strSql.Append("F_ProposerDeptId=@F_ProposerDeptId,");
126 129
             strSql.Append("F_Source=@F_Source,");
127 130
             strSql.Append("F_CallID=@F_CallID,");
@@ -152,6 +155,7 @@ namespace RMYY_CallCenter_Api.Dal
152 155
             SqlParameter[] parameters = {
153 156
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
154 157
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
158
+                    new SqlParameter("@F_HosId", SqlDbType.Int,4),
155 159
                     new SqlParameter("@F_ProposerDeptId", SqlDbType.Int,4),
156 160
                     new SqlParameter("@F_Source", SqlDbType.NVarChar,200),
157 161
                     new SqlParameter("@F_CallID", SqlDbType.VarChar,50),
@@ -181,33 +185,34 @@ namespace RMYY_CallCenter_Api.Dal
181 185
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
182 186
             parameters[0].Value = model.F_WorkOrderCode;
183 187
             parameters[1].Value = model.F_Type;
184
-            parameters[2].Value = model.F_ProposerDeptId;
185
-            parameters[3].Value = model.F_Source;
186
-            parameters[4].Value = model.F_CallID;
187
-            parameters[5].Value = model.F_DepartPlace;
188
-            parameters[6].Value = model.F_Destination;
189
-            parameters[7].Value = model.F_ProposerCode;
190
-            parameters[8].Value = model.F_Phon;
191
-            parameters[9].Value = model.F_CarType;
192
-            parameters[10].Value = model.F_Remark;
193
-            parameters[11].Value = model.F_CreateTime;
194
-            parameters[12].Value = model.F_CarMessage;
195
-            parameters[13].Value = model.F_DriverCode;
196
-            parameters[14].Value = model.F_DriverPhon;
197
-            parameters[15].Value = model.F_DepartTime;
198
-            parameters[16].Value = model.F_DriverName;
199
-            parameters[17].Value = model.F_ProposerName;
200
-            parameters[18].Value = model.F_State;
201
-            parameters[19].Value = model.F_IsDel;
202
-            parameters[20].Value = model.F_DeleteBy;
203
-            parameters[21].Value = model.F_DeleteTime;
204
-            parameters[22].Value = model.F_CreateUser;
205
-            parameters[23].Value = model.F_AssistMan;
206
-            parameters[24].Value = model.F_IsAssist;
207
-            parameters[25].Value = model.F_FinishTime;
208
-            parameters[26].Value = model.F_CarId;
209
-            parameters[27].Value = model.F_AssistManName;
210
-            parameters[28].Value = model.F_ID;
188
+            parameters[2].Value = model.F_HosId;
189
+            parameters[3].Value = model.F_ProposerDeptId;
190
+            parameters[4].Value = model.F_Source;
191
+            parameters[5].Value = model.F_CallID;
192
+            parameters[6].Value = model.F_DepartPlace;
193
+            parameters[7].Value = model.F_Destination;
194
+            parameters[8].Value = model.F_ProposerCode;
195
+            parameters[9].Value = model.F_Phon;
196
+            parameters[10].Value = model.F_CarType;
197
+            parameters[11].Value = model.F_Remark;
198
+            parameters[12].Value = model.F_CreateTime;
199
+            parameters[13].Value = model.F_CarMessage;
200
+            parameters[14].Value = model.F_DriverCode;
201
+            parameters[15].Value = model.F_DriverPhon;
202
+            parameters[16].Value = model.F_DepartTime;
203
+            parameters[17].Value = model.F_DriverName;
204
+            parameters[18].Value = model.F_ProposerName;
205
+            parameters[19].Value = model.F_State;
206
+            parameters[20].Value = model.F_IsDel;
207
+            parameters[21].Value = model.F_DeleteBy;
208
+            parameters[22].Value = model.F_DeleteTime;
209
+            parameters[23].Value = model.F_CreateUser;
210
+            parameters[24].Value = model.F_AssistMan;
211
+            parameters[25].Value = model.F_IsAssist;
212
+            parameters[26].Value = model.F_FinishTime;
213
+            parameters[27].Value = model.F_CarId;
214
+            parameters[28].Value = model.F_AssistManName;
215
+            parameters[29].Value = model.F_ID;
211 216
 
212 217
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
213 218
             if (rows > 0)
@@ -264,6 +269,7 @@ namespace RMYY_CallCenter_Api.Dal
264 269
         }
265 270
 
266 271
 
272
+
267 273
         /// <summary>
268 274
         /// 得到一个对象实体
269 275
         /// </summary>
@@ -271,7 +277,7 @@ namespace RMYY_CallCenter_Api.Dal
271 277
         {
272 278
 
273 279
             StringBuilder strSql = new StringBuilder();
274
-            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Type,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName from T_Car_WorkOrder ");
280
+            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName from T_Car_WorkOrder ");
275 281
             strSql.Append(" where F_ID=@F_ID");
276 282
             SqlParameter[] parameters = {
277 283
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -311,6 +317,10 @@ namespace RMYY_CallCenter_Api.Dal
311 317
                 {
312 318
                     model.F_Type = int.Parse(row["F_Type"].ToString());
313 319
                 }
320
+                if (row["F_HosId"] != null && row["F_HosId"].ToString() != "")
321
+                {
322
+                    model.F_HosId = int.Parse(row["F_HosId"].ToString());
323
+                }
314 324
                 if (row["F_ProposerDeptId"] != null && row["F_ProposerDeptId"].ToString() != "")
315 325
                 {
316 326
                     model.F_ProposerDeptId = int.Parse(row["F_ProposerDeptId"].ToString());
@@ -425,7 +435,7 @@ namespace RMYY_CallCenter_Api.Dal
425 435
         public DataSet GetList(string strWhere)
426 436
         {
427 437
             StringBuilder strSql = new StringBuilder();
428
-            strSql.Append("select F_ID,F_WorkOrderCode,F_Type,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName ");
438
+            strSql.Append("select F_ID,F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName ");
429 439
             strSql.Append(" FROM T_Car_WorkOrder ");
430 440
             if (strWhere.Trim() != "")
431 441
             {
@@ -445,7 +455,7 @@ namespace RMYY_CallCenter_Api.Dal
445 455
             {
446 456
                 strSql.Append(" top " + Top.ToString());
447 457
             }
448
-            strSql.Append(" F_ID,F_WorkOrderCode,F_Type,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName ");
458
+            strSql.Append(" F_ID,F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName ");
449 459
             strSql.Append(" FROM T_Car_WorkOrder ");
450 460
             if (strWhere.Trim() != "")
451 461
             {
@@ -455,6 +465,7 @@ namespace RMYY_CallCenter_Api.Dal
455 465
             return DbHelperSQL.Query(strSql.ToString());
456 466
         }
457 467
 
468
+
458 469
         /// <summary>
459 470
         /// 获取记录总数
460 471
         /// </summary>

文件差异内容过多而无法显示
+ 86 - 77
RMYY_CallCenter_Api.Dal/T_Dev_WorkOrder.cs


文件差异内容过多而无法显示
+ 87 - 79
RMYY_CallCenter_Api.Dal/T_Dis_WorkOrder.cs


文件差异内容过多而无法显示
+ 100 - 89
RMYY_CallCenter_Api.Dal/T_Hos_WorkOrder.cs


+ 75 - 57
RMYY_CallCenter_Api.Dal/T_Mat_WorkOrder.cs

@@ -34,6 +34,7 @@ namespace RMYY_CallCenter_Api.Dal
34 34
         }
35 35
 
36 36
 
37
+
37 38
         /// <summary>
38 39
         /// 增加一条数据
39 40
         /// </summary>
@@ -41,13 +42,14 @@ namespace RMYY_CallCenter_Api.Dal
41 42
         {
42 43
             StringBuilder strSql = new StringBuilder();
43 44
             strSql.Append("insert into T_Mat_WorkOrder(");
44
-            strSql.Append("F_Type,F_WorkOrderCode,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime)");
45
+            strSql.Append("F_Type,F_WorkOrderCode,F_HosId,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_ItemContents,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime)");
45 46
             strSql.Append(" values (");
46
-            strSql.Append("@F_Type,@F_WorkOrderCode,@F_ProposerStore,@F_StorePosition,@F_ProposerCode,@F_ProposerName,@F_ProposerPhon,@F_Source,@F_CallID,@F_SendDeptId,@F_SendDeptName,@F_ItemMessages,@F_Remark,@F_CreateTime,@F_CreateCode,@F_CreateName,@F_State,@F_ControlManCode,@F_ControlManName,@F_TransPersonCode,@F_TransPerson,@F_OutboundTime,@F_IsDel,@F_DeleteBy,@F_DeleteTime,@F_FinishTime)");
47
+            strSql.Append("@F_Type,@F_WorkOrderCode,@F_HosId,@F_ProposerStore,@F_StorePosition,@F_ProposerCode,@F_ProposerName,@F_ProposerPhon,@F_Source,@F_CallID,@F_SendDeptId,@F_SendDeptName,@F_ItemMessages,@F_ItemContents,@F_Remark,@F_CreateTime,@F_CreateCode,@F_CreateName,@F_State,@F_ControlManCode,@F_ControlManName,@F_TransPersonCode,@F_TransPerson,@F_OutboundTime,@F_IsDel,@F_DeleteBy,@F_DeleteTime,@F_FinishTime)");
47 48
             strSql.Append(";select @@IDENTITY");
48 49
             SqlParameter[] parameters = {
49 50
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
50 51
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
52
+                    new SqlParameter("@F_HosId", SqlDbType.Int,4),
51 53
                     new SqlParameter("@F_ProposerStore", SqlDbType.VarChar,50),
52 54
                     new SqlParameter("@F_StorePosition", SqlDbType.NVarChar,200),
53 55
                     new SqlParameter("@F_ProposerCode", SqlDbType.VarChar,50),
@@ -57,7 +59,8 @@ namespace RMYY_CallCenter_Api.Dal
57 59
                     new SqlParameter("@F_CallID", SqlDbType.VarChar,50),
58 60
                     new SqlParameter("@F_SendDeptId", SqlDbType.Int,4),
59 61
                     new SqlParameter("@F_SendDeptName", SqlDbType.VarChar,50),
60
-                    new SqlParameter("@F_ItemMessages", SqlDbType.VarChar,50),
62
+                    new SqlParameter("@F_ItemMessages", SqlDbType.NText),
63
+                    new SqlParameter("@F_ItemContents", SqlDbType.NText),
61 64
                     new SqlParameter("@F_Remark", SqlDbType.NText),
62 65
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
63 66
                     new SqlParameter("@F_CreateCode", SqlDbType.VarChar,50),
@@ -74,30 +77,32 @@ namespace RMYY_CallCenter_Api.Dal
74 77
                     new SqlParameter("@F_FinishTime", SqlDbType.DateTime)};
75 78
             parameters[0].Value = model.F_Type;
76 79
             parameters[1].Value = model.F_WorkOrderCode;
77
-            parameters[2].Value = model.F_ProposerStore;
78
-            parameters[3].Value = model.F_StorePosition;
79
-            parameters[4].Value = model.F_ProposerCode;
80
-            parameters[5].Value = model.F_ProposerName;
81
-            parameters[6].Value = model.F_ProposerPhon;
82
-            parameters[7].Value = model.F_Source;
83
-            parameters[8].Value = model.F_CallID;
84
-            parameters[9].Value = model.F_SendDeptId;
85
-            parameters[10].Value = model.F_SendDeptName;
86
-            parameters[11].Value = model.F_ItemMessages;
87
-            parameters[12].Value = model.F_Remark;
88
-            parameters[13].Value = model.F_CreateTime;
89
-            parameters[14].Value = model.F_CreateCode;
90
-            parameters[15].Value = model.F_CreateName;
91
-            parameters[16].Value = model.F_State;
92
-            parameters[17].Value = model.F_ControlManCode;
93
-            parameters[18].Value = model.F_ControlManName;
94
-            parameters[19].Value = model.F_TransPersonCode;
95
-            parameters[20].Value = model.F_TransPerson;
96
-            parameters[21].Value = model.F_OutboundTime;
97
-            parameters[22].Value = model.F_IsDel;
98
-            parameters[23].Value = model.F_DeleteBy;
99
-            parameters[24].Value = model.F_DeleteTime;
100
-            parameters[25].Value = model.F_FinishTime;
80
+            parameters[2].Value = model.F_HosId;
81
+            parameters[3].Value = model.F_ProposerStore;
82
+            parameters[4].Value = model.F_StorePosition;
83
+            parameters[5].Value = model.F_ProposerCode;
84
+            parameters[6].Value = model.F_ProposerName;
85
+            parameters[7].Value = model.F_ProposerPhon;
86
+            parameters[8].Value = model.F_Source;
87
+            parameters[9].Value = model.F_CallID;
88
+            parameters[10].Value = model.F_SendDeptId;
89
+            parameters[11].Value = model.F_SendDeptName;
90
+            parameters[12].Value = model.F_ItemMessages;
91
+            parameters[13].Value = model.F_ItemContents;
92
+            parameters[14].Value = model.F_Remark;
93
+            parameters[15].Value = model.F_CreateTime;
94
+            parameters[16].Value = model.F_CreateCode;
95
+            parameters[17].Value = model.F_CreateName;
96
+            parameters[18].Value = model.F_State;
97
+            parameters[19].Value = model.F_ControlManCode;
98
+            parameters[20].Value = model.F_ControlManName;
99
+            parameters[21].Value = model.F_TransPersonCode;
100
+            parameters[22].Value = model.F_TransPerson;
101
+            parameters[23].Value = model.F_OutboundTime;
102
+            parameters[24].Value = model.F_IsDel;
103
+            parameters[25].Value = model.F_DeleteBy;
104
+            parameters[26].Value = model.F_DeleteTime;
105
+            parameters[27].Value = model.F_FinishTime;
101 106
 
102 107
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
103 108
             if (obj == null)
@@ -118,6 +123,7 @@ namespace RMYY_CallCenter_Api.Dal
118 123
             strSql.Append("update T_Mat_WorkOrder set ");
119 124
             strSql.Append("F_Type=@F_Type,");
120 125
             strSql.Append("F_WorkOrderCode=@F_WorkOrderCode,");
126
+            strSql.Append("F_HosId=@F_HosId,");
121 127
             strSql.Append("F_ProposerStore=@F_ProposerStore,");
122 128
             strSql.Append("F_StorePosition=@F_StorePosition,");
123 129
             strSql.Append("F_ProposerCode=@F_ProposerCode,");
@@ -128,6 +134,7 @@ namespace RMYY_CallCenter_Api.Dal
128 134
             strSql.Append("F_SendDeptId=@F_SendDeptId,");
129 135
             strSql.Append("F_SendDeptName=@F_SendDeptName,");
130 136
             strSql.Append("F_ItemMessages=@F_ItemMessages,");
137
+            strSql.Append("F_ItemContents=@F_ItemContents,");
131 138
             strSql.Append("F_Remark=@F_Remark,");
132 139
             strSql.Append("F_CreateTime=@F_CreateTime,");
133 140
             strSql.Append("F_CreateCode=@F_CreateCode,");
@@ -146,6 +153,7 @@ namespace RMYY_CallCenter_Api.Dal
146 153
             SqlParameter[] parameters = {
147 154
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
148 155
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
156
+                    new SqlParameter("@F_HosId", SqlDbType.Int,4),
149 157
                     new SqlParameter("@F_ProposerStore", SqlDbType.VarChar,50),
150 158
                     new SqlParameter("@F_StorePosition", SqlDbType.NVarChar,200),
151 159
                     new SqlParameter("@F_ProposerCode", SqlDbType.VarChar,50),
@@ -155,7 +163,8 @@ namespace RMYY_CallCenter_Api.Dal
155 163
                     new SqlParameter("@F_CallID", SqlDbType.VarChar,50),
156 164
                     new SqlParameter("@F_SendDeptId", SqlDbType.Int,4),
157 165
                     new SqlParameter("@F_SendDeptName", SqlDbType.VarChar,50),
158
-                    new SqlParameter("@F_ItemMessages", SqlDbType.VarChar,50),
166
+                    new SqlParameter("@F_ItemMessages", SqlDbType.NText),
167
+                    new SqlParameter("@F_ItemContents", SqlDbType.NText),
159 168
                     new SqlParameter("@F_Remark", SqlDbType.NText),
160 169
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
161 170
                     new SqlParameter("@F_CreateCode", SqlDbType.VarChar,50),
@@ -173,31 +182,33 @@ namespace RMYY_CallCenter_Api.Dal
173 182
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
174 183
             parameters[0].Value = model.F_Type;
175 184
             parameters[1].Value = model.F_WorkOrderCode;
176
-            parameters[2].Value = model.F_ProposerStore;
177
-            parameters[3].Value = model.F_StorePosition;
178
-            parameters[4].Value = model.F_ProposerCode;
179
-            parameters[5].Value = model.F_ProposerName;
180
-            parameters[6].Value = model.F_ProposerPhon;
181
-            parameters[7].Value = model.F_Source;
182
-            parameters[8].Value = model.F_CallID;
183
-            parameters[9].Value = model.F_SendDeptId;
184
-            parameters[10].Value = model.F_SendDeptName;
185
-            parameters[11].Value = model.F_ItemMessages;
186
-            parameters[12].Value = model.F_Remark;
187
-            parameters[13].Value = model.F_CreateTime;
188
-            parameters[14].Value = model.F_CreateCode;
189
-            parameters[15].Value = model.F_CreateName;
190
-            parameters[16].Value = model.F_State;
191
-            parameters[17].Value = model.F_ControlManCode;
192
-            parameters[18].Value = model.F_ControlManName;
193
-            parameters[19].Value = model.F_TransPersonCode;
194
-            parameters[20].Value = model.F_TransPerson;
195
-            parameters[21].Value = model.F_OutboundTime;
196
-            parameters[22].Value = model.F_IsDel;
197
-            parameters[23].Value = model.F_DeleteBy;
198
-            parameters[24].Value = model.F_DeleteTime;
199
-            parameters[25].Value = model.F_FinishTime;
200
-            parameters[26].Value = model.F_Id;
185
+            parameters[2].Value = model.F_HosId;
186
+            parameters[3].Value = model.F_ProposerStore;
187
+            parameters[4].Value = model.F_StorePosition;
188
+            parameters[5].Value = model.F_ProposerCode;
189
+            parameters[6].Value = model.F_ProposerName;
190
+            parameters[7].Value = model.F_ProposerPhon;
191
+            parameters[8].Value = model.F_Source;
192
+            parameters[9].Value = model.F_CallID;
193
+            parameters[10].Value = model.F_SendDeptId;
194
+            parameters[11].Value = model.F_SendDeptName;
195
+            parameters[12].Value = model.F_ItemMessages;
196
+            parameters[13].Value = model.F_ItemContents;
197
+            parameters[14].Value = model.F_Remark;
198
+            parameters[15].Value = model.F_CreateTime;
199
+            parameters[16].Value = model.F_CreateCode;
200
+            parameters[17].Value = model.F_CreateName;
201
+            parameters[18].Value = model.F_State;
202
+            parameters[19].Value = model.F_ControlManCode;
203
+            parameters[20].Value = model.F_ControlManName;
204
+            parameters[21].Value = model.F_TransPersonCode;
205
+            parameters[22].Value = model.F_TransPerson;
206
+            parameters[23].Value = model.F_OutboundTime;
207
+            parameters[24].Value = model.F_IsDel;
208
+            parameters[25].Value = model.F_DeleteBy;
209
+            parameters[26].Value = model.F_DeleteTime;
210
+            parameters[27].Value = model.F_FinishTime;
211
+            parameters[28].Value = model.F_Id;
201 212
 
202 213
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
203 214
             if (rows > 0)
@@ -253,7 +264,6 @@ namespace RMYY_CallCenter_Api.Dal
253 264
             }
254 265
         }
255 266
 
256
-
257 267
         /// <summary>
258 268
         /// 得到一个对象实体
259 269
         /// </summary>
@@ -261,7 +271,7 @@ namespace RMYY_CallCenter_Api.Dal
261 271
         {
262 272
 
263 273
             StringBuilder strSql = new StringBuilder();
264
-            strSql.Append("select  top 1 F_Id,F_Type,F_WorkOrderCode,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime from T_Mat_WorkOrder ");
274
+            strSql.Append("select  top 1 F_Id,F_Type,F_WorkOrderCode,F_HosId,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_ItemContents,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime from T_Mat_WorkOrder ");
265 275
             strSql.Append(" where F_Id=@F_Id");
266 276
             SqlParameter[] parameters = {
267 277
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -301,6 +311,10 @@ namespace RMYY_CallCenter_Api.Dal
301 311
                 {
302 312
                     model.F_WorkOrderCode = row["F_WorkOrderCode"].ToString();
303 313
                 }
314
+                if (row["F_HosId"] != null && row["F_HosId"].ToString() != "")
315
+                {
316
+                    model.F_HosId = int.Parse(row["F_HosId"].ToString());
317
+                }
304 318
                 if (row["F_ProposerStore"] != null)
305 319
                 {
306 320
                     model.F_ProposerStore = row["F_ProposerStore"].ToString();
@@ -341,6 +355,10 @@ namespace RMYY_CallCenter_Api.Dal
341 355
                 {
342 356
                     model.F_ItemMessages = row["F_ItemMessages"].ToString();
343 357
                 }
358
+                if (row["F_ItemContents"] != null)
359
+                {
360
+                    model.F_ItemContents = row["F_ItemContents"].ToString();
361
+                }
344 362
                 if (row["F_Remark"] != null)
345 363
                 {
346 364
                     model.F_Remark = row["F_Remark"].ToString();
@@ -407,7 +425,7 @@ namespace RMYY_CallCenter_Api.Dal
407 425
         public DataSet GetList(string strWhere)
408 426
         {
409 427
             StringBuilder strSql = new StringBuilder();
410
-            strSql.Append("select F_Id,F_Type,F_WorkOrderCode,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime ");
428
+            strSql.Append("select F_Id,F_Type,F_WorkOrderCode,F_HosId,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_ItemContents,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime ");
411 429
             strSql.Append(" FROM T_Mat_WorkOrder ");
412 430
             if (strWhere.Trim() != "")
413 431
             {
@@ -427,7 +445,7 @@ namespace RMYY_CallCenter_Api.Dal
427 445
             {
428 446
                 strSql.Append(" top " + Top.ToString());
429 447
             }
430
-            strSql.Append(" F_Id,F_Type,F_WorkOrderCode,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime ");
448
+            strSql.Append(" F_Id,F_Type,F_WorkOrderCode,F_HosId,F_ProposerStore,F_StorePosition,F_ProposerCode,F_ProposerName,F_ProposerPhon,F_Source,F_CallID,F_SendDeptId,F_SendDeptName,F_ItemMessages,F_ItemContents,F_Remark,F_CreateTime,F_CreateCode,F_CreateName,F_State,F_ControlManCode,F_ControlManName,F_TransPersonCode,F_TransPerson,F_OutboundTime,F_IsDel,F_DeleteBy,F_DeleteTime,F_FinishTime ");
431 449
             strSql.Append(" FROM T_Mat_WorkOrder ");
432 450
             if (strWhere.Trim() != "")
433 451
             {

+ 10 - 0
RMYY_CallCenter_Api.Model/T_Acc_WorkOrder.cs

@@ -19,6 +19,7 @@ namespace RMYY_CallCenter_Api.Model
19 19
         private int? _f_type;
20 20
         private string _f_workordercode;
21 21
         private int? _f_proposerdeptid;
22
+        private int? _f_hosid; 
22 23
         private string _f_proposerdeptname;
23 24
         private string _f_proposercode;
24 25
         private string _f_proposername;
@@ -78,6 +79,15 @@ namespace RMYY_CallCenter_Api.Model
78 79
             set { _f_workordercode = value; }
79 80
             get { return _f_workordercode; }
80 81
         }
82
+
83
+        /// <summary>
84
+        /// 申请院区
85
+        /// </summary>
86
+        public int? F_HosId
87
+        {
88
+            set { _f_hosid = value; }
89
+            get { return _f_hosid; }
90
+        }
81 91
         /// <summary>
82 92
         /// 申请科室
83 93
         /// </summary>

+ 10 - 0
RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs

@@ -18,6 +18,7 @@ namespace RMYY_CallCenter_Api.Model
18 18
         private int _f_id;
19 19
         private string _f_workordercode;
20 20
         private int? _f_type;
21
+        private int? _f_hosid;
21 22
         private int? _f_proposerdeptid;
22 23
         private string _f_source;
23 24
         private string _f_callid;
@@ -68,6 +69,15 @@ namespace RMYY_CallCenter_Api.Model
68 69
             set { _f_type = value; }
69 70
             get { return _f_type; }
70 71
         }
72
+
73
+        /// <summary>
74
+        /// 申请院区
75
+        /// </summary>
76
+        public int? F_HosId
77
+        {
78
+            set { _f_hosid = value; }
79
+            get { return _f_hosid; }
80
+        }
71 81
         /// <summary>
72 82
         /// 申请科室
73 83
         /// </summary>

+ 11 - 0
RMYY_CallCenter_Api.Model/T_Dev_WorkOrder.cs

@@ -19,6 +19,7 @@ namespace RMYY_CallCenter_Api.Model
19 19
         private int? _f_type;
20 20
         private int? _f_type1;
21 21
         private string _f_workordercode;
22
+        private int? _f_hosid;
22 23
         private int? _f_proposerdeptid;
23 24
         private string _f_proposercode;
24 25
         private string _f_proposername;
@@ -82,6 +83,16 @@ namespace RMYY_CallCenter_Api.Model
82 83
             set { _f_workordercode = value; }
83 84
             get { return _f_workordercode; }
84 85
         }
86
+
87
+        /// <summary>
88
+        /// 申请院区
89
+        /// </summary>
90
+        public int? F_HosId
91
+        {
92
+            set { _f_hosid = value; }
93
+            get { return _f_hosid; }
94
+        }
95
+
85 96
         /// <summary>
86 97
         /// 使用科室
87 98
         /// </summary>

+ 10 - 0
RMYY_CallCenter_Api.Model/T_Dis_WorkOrder.cs

@@ -19,6 +19,7 @@ namespace RMYY_CallCenter_Api.Model
19 19
         private int? _f_type;
20 20
         private string _f_orthertype;
21 21
         private string _f_workordercode;
22
+        private int? _f_hosid;
22 23
         private int? _f_proposerdeptid;
23 24
         private string _f_proposerdeptname;
24 25
         private string _f_proposercode;
@@ -87,6 +88,15 @@ namespace RMYY_CallCenter_Api.Model
87 88
             set { _f_workordercode = value; }
88 89
             get { return _f_workordercode; }
89 90
         }
91
+
92
+        /// <summary>
93
+        /// 申请院区
94
+        /// </summary>
95
+        public int? F_HosId
96
+        {
97
+            set { _f_hosid = value; }
98
+            get { return _f_hosid; }
99
+        }
90 100
         /// <summary>
91 101
         /// 申请科室
92 102
         /// </summary>

+ 10 - 0
RMYY_CallCenter_Api.Model/T_Hos_WorkOrder.cs

@@ -19,6 +19,7 @@ namespace RMYY_CallCenter_Api.Model
19 19
         private int _f_id;
20 20
         private int? _f_type;
21 21
         private string _f_workordercode;
22
+        private int? _f_hosid;
22 23
         private int? _f_proposerdeptid;
23 24
         private string _f_proposerdeptname;
24 25
         private string _f_proposercode;
@@ -79,6 +80,15 @@ namespace RMYY_CallCenter_Api.Model
79 80
             set { _f_workordercode = value; }
80 81
             get { return _f_workordercode; }
81 82
         }
83
+
84
+        /// <summary>
85
+        /// 申请院区
86
+        /// </summary>
87
+        public int? F_HosId
88
+        {
89
+            set { _f_hosid = value; }
90
+            get { return _f_hosid; }
91
+        }
82 92
         /// <summary>
83 93
         /// 申请科室
84 94
         /// </summary>

+ 17 - 0
RMYY_CallCenter_Api.Model/T_Mat_WorkOrder.cs

@@ -17,6 +17,7 @@ namespace RMYY_CallCenter_Api.Model
17 17
         private int _f_id;
18 18
         private int? _f_type;
19 19
         private string _f_workordercode;
20
+        private int? _f_hosid;
20 21
         private string _f_proposerstore;
21 22
         private string _f_storeposition;
22 23
         private string _f_proposercode;
@@ -27,6 +28,7 @@ namespace RMYY_CallCenter_Api.Model
27 28
         private int? _f_senddeptid;
28 29
         private string _f_senddeptname;
29 30
         private string _f_itemmessages;
31
+        private string _f_itemcontents;
30 32
         private string _f_remark;
31 33
         private DateTime? _f_createtime;
32 34
         private string _f_createcode;
@@ -66,6 +68,14 @@ namespace RMYY_CallCenter_Api.Model
66 68
             get { return _f_workordercode; }
67 69
         }
68 70
         /// <summary>
71
+        /// 申请院区
72
+        /// </summary>
73
+        public int? F_HosId
74
+        {
75
+            set { _f_hosid = value; }
76
+            get { return _f_hosid; }
77
+        }
78
+        /// <summary>
69 79
         /// 申请仓库
70 80
         /// </summary>
71 81
         public string F_ProposerStore
@@ -146,6 +156,13 @@ namespace RMYY_CallCenter_Api.Model
146 156
             get { return _f_itemmessages; }
147 157
         }
148 158
         /// <summary>
159
+        /// 配送内容
160
+        /// </summary>
161
+        public string F_ItemContents
162
+        { set { _f_itemcontents = value; }
163
+            get {return _f_itemcontents; }
164
+        }
165
+        /// <summary>
149 166
         /// 备注
150 167
         /// </summary>
151 168
         public string F_Remark