Bladeren bron

合并修改

duhongyu 6 jaren geleden
bovenliggende
commit
7607d1fb60

+ 42 - 104
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

44
         /// <param name="conname">联系人姓名</param>
44
         /// <param name="conname">联系人姓名</param>
45
         /// <param name="contel">联系人电话</param>
45
         /// <param name="contel">联系人电话</param>
46
         /// <returns></returns>
46
         /// <returns></returns>
47
-        public ActionResult GetList(string code, string cmpname, string legname, string legtel,string province, string city, 
48
-            string country, string township, int areaid = 0, int branchid = 0,int pageindex = 1, int pagesize = 10)
47
+        public ActionResult GetList(string code, string cmpname, string legname, string legtel, string province, string city,
48
+            string country, string township, int areaid = 0, int branchid = 0, int pageindex = 1, int pagesize = 10)
49
         {
49
         {
50
             string sql = $" and F_IsDelete=0";
50
             string sql = $" and F_IsDelete=0";
51
             DataTable dt = new DataTable();
51
             DataTable dt = new DataTable();
116
                 sql += " and F_IsDelete=0";
116
                 sql += " and F_IsDelete=0";
117
                 list = cusbll.GetModelList(sql);
117
                 list = cusbll.GetModelList(sql);
118
             }
118
             }
119
-            if (list.Count >0)
119
+            if (list.Count > 0)
120
             {
120
             {
121
                 List<CustomerBaseNewInput> Input = modeltooip(list);
121
                 List<CustomerBaseNewInput> Input = modeltooip(list);
122
-                if (Input!=null )
122
+                if (Input != null)
123
                     return Success("根据关键字获取公司信息", Input.FirstOrDefault());
123
                     return Success("根据关键字获取公司信息", Input.FirstOrDefault());
124
                 else
124
                 else
125
                     return Error("没有获取到相关公司,请重新搜索");
125
                     return Error("没有获取到相关公司,请重新搜索");
132
         ///根据客户编码获取客户信息
132
         ///根据客户编码获取客户信息
133
         /// </summary>
133
         /// </summary>
134
         /// <returns></returns>
134
         /// <returns></returns>
135
-        public ActionResult GetCodeCustomer(string  code)
135
+        public ActionResult GetCodeCustomer(string code)
136
         {
136
         {
137
             var list = new List<Model.T_Cus_CustomerBaseNew>(); DataTable dt = new DataTable();
137
             var list = new List<Model.T_Cus_CustomerBaseNew>(); DataTable dt = new DataTable();
138
             string sql = "  F_IsDelete=0";
138
             string sql = "  F_IsDelete=0";
149
                     if (Input != null)
149
                     if (Input != null)
150
                         return Success("获取成功", Input.FirstOrDefault());
150
                         return Success("获取成功", Input.FirstOrDefault());
151
                     else
151
                     else
152
-                        return Success("没有获取到客户信息,请检查客户编号", null );
152
+                        return Success("没有获取到客户信息,请检查客户编号", null);
153
                 }
153
                 }
154
                 else
154
                 else
155
                 {
155
                 {
159
             else
159
             else
160
             {
160
             {
161
                 return Success("请输入客户编号", null);
161
                 return Success("请输入客户编号", null);
162
-             
162
+
163
             }
163
             }
164
         }
164
         }
165
         /// <summary>
165
         /// <summary>
216
                 return Error("参数传输失败");
216
                 return Error("参数传输失败");
217
             }
217
             }
218
         }
218
         }
219
-        private string  GetIntCode(int i )
219
+        private string GetIntCode(int i)
220
         {
220
         {
221
             DateTime times = DateTime.Now.AddMinutes(i);
221
             DateTime times = DateTime.Now.AddMinutes(i);
222
             string time = times.ToString("yyMMddhhmm");
222
             string time = times.ToString("yyMMddhhmm");
231
             var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
231
             var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
232
             if (userModel.Count() > 0)
232
             if (userModel.Count() > 0)
233
             {
233
             {
234
-            var model = cusbll.GetModel(userModel[0].F_CustomerId);
234
+                var model = cusbll.GetModel(userModel[0].F_CustomerId);
235
                 #region 保存客户基本信息
235
                 #region 保存客户基本信息
236
-           model = inputtoobj(model, input);
237
-            #endregion
238
-            bool n = cusbll.Update(model);
239
-            if (n)
240
-            {
241
-                return Success("保存成功!");
242
-            }
243
-            else
244
-                return Error("保存失败!");
236
+                model = inputtoobj(model, input);
237
+                #endregion
238
+                bool n = cusbll.Update(model);
239
+                if (n)
240
+                {
241
+                    return Success("保存成功!");
242
+                }
243
+                else
244
+                    return Error("保存失败!");
245
             }
245
             }
246
             else
246
             else
247
             {
247
             {
305
                 {
305
                 {
306
                     if (!getunique(0, GetIntCode(i)))
306
                     if (!getunique(0, GetIntCode(i)))
307
                     {
307
                     {
308
-                        input.F_CustomerCode= GetIntCode(i);
309
-                        break ;
308
+                        input.F_CustomerCode = GetIntCode(i);
309
+                        break;
310
                     }
310
                     }
311
                     else
311
                     else
312
                     {
312
                     {
359
         /// <summary>
359
         /// <summary>
360
         /// 根据model返回CustomerBaseNewInput对象
360
         /// 根据model返回CustomerBaseNewInput对象
361
         /// </summary>
361
         /// </summary>
362
-        private List<CustomerBaseNewInput> modeltooip(List <Model.T_Cus_CustomerBaseNew> model)
362
+        private List<CustomerBaseNewInput> modeltooip(List<Model.T_Cus_CustomerBaseNew> model)
363
         {
363
         {
364
-            if (model!=null &&model .Count >0)
364
+            if (model != null && model.Count > 0)
365
             {
365
             {
366
                 List<CustomerBaseNewInput> Input = new List<CustomerBaseNewInput>(model.Count);
366
                 List<CustomerBaseNewInput> Input = new List<CustomerBaseNewInput>(model.Count);
367
-                for (int i=0;i<model .Count;i++)
367
+                for (int i = 0; i < model.Count; i++)
368
                 {
368
                 {
369
                     CustomerBaseNewInput Input1 = new CustomerBaseNewInput();
369
                     CustomerBaseNewInput Input1 = new CustomerBaseNewInput();
370
                     #region 基本字段
370
                     #region 基本字段
371
                     Input1.F_CustomerId = model[i].F_CustomerId;//业务员
371
                     Input1.F_CustomerId = model[i].F_CustomerId;//业务员
372
                     if (!string.IsNullOrWhiteSpace(model[i].F_CustomerCode))
372
                     if (!string.IsNullOrWhiteSpace(model[i].F_CustomerCode))
373
                         Input1.F_CustomerCode = model[i].F_CustomerCode;
373
                         Input1.F_CustomerCode = model[i].F_CustomerCode;
374
-                 
374
+
375
                     if (!string.IsNullOrWhiteSpace(model[i].F_CompanyName))
375
                     if (!string.IsNullOrWhiteSpace(model[i].F_CompanyName))
376
                         Input1.F_CompanyName = model[i].F_CompanyName;
376
                         Input1.F_CompanyName = model[i].F_CompanyName;
377
                     Input1.F_AreaID = model[i].F_AreaID;//大区ID
377
                     Input1.F_AreaID = model[i].F_AreaID;//大区ID
378
                     Input1.F_BranchID = model[i].F_BranchID;//分公司ID
378
                     Input1.F_BranchID = model[i].F_BranchID;//分公司ID
379
-                    if (!string .IsNullOrEmpty (model[i].F_AreaID))
380
-                   {
379
+                    if (!string.IsNullOrEmpty(model[i].F_AreaID))
380
+                    {
381
                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
381
                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
382
                         if (pdModel != null)
382
                         if (pdModel != null)
383
                         {
383
                         {
392
                             Input1.F_BranchName = pdModel1.F_DeptName.ToString();
392
                             Input1.F_BranchName = pdModel1.F_DeptName.ToString();
393
                         }
393
                         }
394
                     }
394
                     }
395
-                    if (!string .IsNullOrEmpty (model[i].F_Gender) )
395
+                    if (!string.IsNullOrEmpty(model[i].F_Gender))
396
                     {
396
                     {
397
-                        if (model[i].F_Gender=="1")
397
+                        if (model[i].F_Gender == "1")
398
                         {
398
                         {
399
                             Input1.F_Gender = "男";
399
                             Input1.F_Gender = "男";
400
                         }
400
                         }
405
                     }
405
                     }
406
                     Input1.F_Salesman = model[i].F_Salesman;//业务员
406
                     Input1.F_Salesman = model[i].F_Salesman;//业务员
407
                     Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
407
                     Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
408
-                
408
+
409
                     Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
409
                     Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
410
                     Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空
410
                     Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空
411
                     Input1.F_Legal = model[i].F_Legal;//法人 
411
                     Input1.F_Legal = model[i].F_Legal;//法人 
440
         /// <summary>
440
         /// <summary>
441
         /// 根据传入的对象和input的内容返回对象
441
         /// 根据传入的对象和input的内容返回对象
442
         /// </summary>
442
         /// </summary>
443
-        private Model.T_Cus_CustomerBaseNew inputtoobj(Model.T_Cus_CustomerBaseNew model,CustomerBaseNewInput input)
443
+        private Model.T_Cus_CustomerBaseNew inputtoobj(Model.T_Cus_CustomerBaseNew model, CustomerBaseNewInput input)
444
         {
444
         {
445
             var newmodel = model;
445
             var newmodel = model;
446
             if (!string.IsNullOrWhiteSpace(input.F_CustomerCode))
446
             if (!string.IsNullOrWhiteSpace(input.F_CustomerCode))
452
             #region 基本字段
452
             #region 基本字段
453
             model.F_AreaID = input.F_AreaID;//大区ID
453
             model.F_AreaID = input.F_AreaID;//大区ID
454
             model.F_BranchID = input.F_BranchID;//分公司ID
454
             model.F_BranchID = input.F_BranchID;//分公司ID
455
-            model.F_Gender = input.F_Gender ;//分公司ID
455
+            model.F_Gender = input.F_Gender;//分公司ID
456
             model.F_Salesman = input.F_Salesman;//业务员
456
             model.F_Salesman = input.F_Salesman;//业务员
457
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话
457
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话
458
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
458
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
486
             var sql = " F_IsDelete=0 ";
486
             var sql = " F_IsDelete=0 ";
487
             sql += "and (F_CustomerCode='" + code + "')";
487
             sql += "and (F_CustomerCode='" + code + "')";
488
             if (id > 0)
488
             if (id > 0)
489
-                sql += " and F_CustomerId<>"+id;
490
-            var count=cusbll.GetModelList(sql).Count();
491
-            
489
+                sql += " and F_CustomerId<>" + id;
490
+            var count = cusbll.GetModelList(sql).Count();
491
+
492
             return count > 0;
492
             return count > 0;
493
         }
493
         }
494
         /// <summary>
494
         /// <summary>
638
 
638
 
639
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
639
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
640
                             {
640
                             {
641
-<<<<<<< .merge_file_a05968
642
-                               if (getunphone(0, dr["客户电话"].ToString()))
643
-                               {
644
-                                    if (!getunique(0, dr["客户编号"].ToString()))
645
-=======
646
-                                if (!getunique(0, dr["客户编号"].ToString()))
641
+
642
+                                if (getunphone(0, dr["客户电话"].ToString()))
647
                                 {
643
                                 {
648
-                                    dModel.F_CustomerCode = dr["客户编号"].ToString();
649
-                                    dModel.F_CompanyName = dr["公司名称"].ToString();
650
-                                    #region
651
-                                    Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
652
-                                    if (pdModel != null)
653
-                                    {
654
-                                        dModel.F_AreaID = pdModel.F_DeptId.ToString();
655
-                                    }
656
-                                    Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
657
-                                    if (pdModel1 != null)
658
-                                    {
659
-                                        dModel.F_BranchID = pdModel1.F_DeptId.ToString();
660
-                                    }
661
 
644
 
662
-                                    dModel.F_Salesman = dr["业务员"].ToString();
663
-                                    dModel.F_SalesPhone = dr["业务员电话"].ToString();
664
-                                    dModel.F_CustomerNature = dr["客户性质"].ToString();
665
-                                    dModel.F_Channel = dr["渠道类型"].ToString();
666
-                                    dModel.F_Credit = dr["信用等级"].ToString();
667
-                                    dModel.F_Legal = dr["客户"].ToString();
668
-                                    if (!string.IsNullOrEmpty(dr["性别"].ToString()))
669
->>>>>>> .merge_file_a02452
645
+                                    if (!getunique(0, dr["客户编号"].ToString()))
670
                                     {
646
                                     {
671
                                         dModel.F_CustomerCode = dr["客户编号"].ToString();
647
                                         dModel.F_CustomerCode = dr["客户编号"].ToString();
672
                                         dModel.F_CompanyName = dr["公司名称"].ToString();
648
                                         dModel.F_CompanyName = dr["公司名称"].ToString();
673
-                                        #region
674
                                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
649
                                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
675
                                         if (pdModel != null)
650
                                         if (pdModel != null)
676
                                         {
651
                                         {
681
                                         {
656
                                         {
682
                                             dModel.F_BranchID = pdModel1.F_DeptId.ToString();
657
                                             dModel.F_BranchID = pdModel1.F_DeptId.ToString();
683
                                         }
658
                                         }
684
-
659
+                                        #region
685
                                         dModel.F_Salesman = dr["业务员"].ToString();
660
                                         dModel.F_Salesman = dr["业务员"].ToString();
686
                                         dModel.F_SalesPhone = dr["业务员电话"].ToString();
661
                                         dModel.F_SalesPhone = dr["业务员电话"].ToString();
687
                                         dModel.F_Channel = dr["渠道类型"].ToString();
662
                                         dModel.F_Channel = dr["渠道类型"].ToString();
698
                                                 dModel.F_Gender = "1";
673
                                                 dModel.F_Gender = "1";
699
                                             }
674
                                             }
700
                                         }
675
                                         }
701
-
702
                                         dModel.F_LegalPhone = dr["客户电话"].ToString();
676
                                         dModel.F_LegalPhone = dr["客户电话"].ToString();
703
                                         dModel.F_AddressProvince = dr["省"].ToString();
677
                                         dModel.F_AddressProvince = dr["省"].ToString();
704
                                         dModel.F_AddressCity = dr["市"].ToString();
678
                                         dModel.F_AddressCity = dr["市"].ToString();
723
                                         }
697
                                         }
724
                                         else
698
                                         else
725
                                         {
699
                                         {
726
-
727
                                             msg = msg + "第" + headrow + "行,导入失败<br>";
700
                                             msg = msg + "第" + headrow + "行,导入失败<br>";
728
                                         }
701
                                         }
729
                                     }
702
                                     }
730
-<<<<<<< .merge_file_a05968
703
+
731
                                     else
704
                                     else
732
                                     {
705
                                     {
733
                                         msg = msg + "第" + headrow + "行,客户编号重复,未导入<br>";
706
                                         msg = msg + "第" + headrow + "行,客户编号重复,未导入<br>";
734
-=======
735
-
736
-                                    dModel.F_LegalPhone = dr["客户电话"].ToString();
737
-                                    dModel.F_AddressProvince = dr["省"].ToString();
738
-                                    dModel.F_AddressCity = dr["市"].ToString();
739
-                                    dModel.F_AddressCountry = dr["县"].ToString();
740
-                                    dModel.F_AddressTownship = dr["乡"].ToString();
741
-                                    dModel.F_AddressFull = dr["详细地址"].ToString();
742
-                                    dModel.F_Brands = dr["经营品牌"].ToString();
743
-                                    dModel.F_Product = dr["产品"].ToString();
744
-                                    dModel.F_FrozenFlag = dr["冻结标志"].ToString();
745
-                                    dModel.F_IsOpenAccount = dr["是否开户"].ToString();
746
-                                    dModel.F_LevelCode = dr["上级客户编码"].ToString();
747
-                                    dModel.F_LevelName = dr["上级客户名称"].ToString();
748
-                                    dModel.F_MnemonicCode = dr["助记码"].ToString();
749
-                                    dModel.F_InvoiceBank = dr["开票银行名称"].ToString();
750
-                                    dModel.F_InvoiceBankAccount = dr["开票银行账号"].ToString();
751
-                                    dModel.F_TaxRegCode = dr["纳税人登记号"].ToString();
752
-                                    dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
753
-                                    dModel.F_AnnualSales = dr["年销量"].ToString();
754
-                                    dModel.F_Formula = dr["配方"].ToString();
755
-                                    dModel.F_RaiseCrops = dr["种植作物"].ToString();
756
-                                    dModel.F_PlantingArea = dr["种植面积"].ToString();
757
-                                    dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
758
-                                    dModel.F_Remark = dr["备注"].ToString();
759
-                                    #endregion
760
-                                    dModel.F_CreateOn = DateTime.Now;
761
-                                    var res = cusbll.Add(dModel);
762
-                                    if (res > 0)
763
-                                    {
764
-                                        addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为:" + newpath + ",当前为第" + headrow + "行");
765
                                     }
707
                                     }
766
-                                    else
767
-                                    {
768
 
708
 
769
-                                        msg = msg + "第" + headrow + "行,导入失败<br>";
770
->>>>>>> .merge_file_a02452
771
-                                    }
709
+
772
                                 }
710
                                 }
773
                                 else
711
                                 else
774
                                 {
712
                                 {
775
                                     msg = msg + "第" + headrow + "行,客户电话重复,未导入<br>";
713
                                     msg = msg + "第" + headrow + "行,客户电话重复,未导入<br>";
776
                                 }
714
                                 }
777
-                                
715
+
778
                             }
716
                             }
779
                             else
717
                             else
780
                                 msg = msg + "第" + headrow + "行,客户编号为空或格式不正确,未导入<br>";
718
                                 msg = msg + "第" + headrow + "行,客户编号为空或格式不正确,未导入<br>";
817
         }
755
         }
818
         #endregion
756
         #endregion
819
     }
757
     }
820
-}
758
+}

+ 3 - 9
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

164
             if (type == (int)EnumWOType.SpotCheck)//抽检
164
             if (type == (int)EnumWOType.SpotCheck)//抽检
165
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
165
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
166
             int recordCount = 0;
166
             int recordCount = 0;
167
-<<<<<<< .merge_file_a04624
168
-            if (QuestionName==""&& type == (int)EnumWOType.Complaint)
169
-                {
170
-=======
167
+
168
+         
171
             if (QuestionName == "" && type == (int)EnumWOType.Complaint)
169
             if (QuestionName == "" && type == (int)EnumWOType.Complaint)
172
             {
170
             {
173
->>>>>>> .merge_file_a19284
171
+
174
                 dt = BLL.PagerBLL.GetListPager(
172
                 dt = BLL.PagerBLL.GetListPager(
175
                        "T_Wo_QuestionManage",
173
                        "T_Wo_QuestionManage",
176
                        "F_ID",
174
                        "F_ID",
195
                       true,
193
                       true,
196
                       out recordCount);
194
                       out recordCount);
197
             }
195
             }
198
-<<<<<<< .merge_file_a04624
199
-        
200
-=======
201
 
196
 
202
->>>>>>> .merge_file_a19284
203
             List<Model.TreeModel> modelList = BindTree(dt, "0");
197
             List<Model.TreeModel> modelList = BindTree(dt, "0");
204
             if (modelList != null)
198
             if (modelList != null)
205
             {
199
             {

+ 12 - 95
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

4178
                 long n = workOrder.Add(model);
4178
                 long n = workOrder.Add(model);
4179
                 if (n > 0)
4179
                 if (n > 0)
4180
                 {
4180
                 {
4181
-<<<<<<< .merge_file_a17512
4181
+
4182
                     Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
4182
                     Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
4183
                     WorkOrderNewInput inputs = new WorkOrderNewInput();
4183
                     WorkOrderNewInput inputs = new WorkOrderNewInput();
4184
                         if (clbm == 0 && clid == 0)
4184
                         if (clbm == 0 && clid == 0)
4185
                         {
4185
                         {
4186
                             return Error("请选择接收部门");
4186
                             return Error("请选择接收部门");
4187
                         }
4187
                         }
4188
-                        else
4189
-=======
4190
-                    DataTable dt = new DataTable();
4191
-                    dt = new BLL.T_Wo_WorkOrder().GetList(1, "", "F_ID desc").Tables[0];
4192
-                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
4193
-                    WorkOrderNewInput inputs = new WorkOrderNewInput();
4194
-                    //if (clbm == 0 && clid == 0)
4195
-                    //{
4196
-                    //    return Error("请选择接收人");
4197
-                    //}
4198
-                    //else
4199
-                    //{
4200
-                    if (clbm == 0)
4201
-                        return Error("请选择指派部门");
4202
                     var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
4188
                     var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
4203
-                    if (deptmodel != null)
4204
-                    {
4205
-                        if (modlelist != null && modlelist.Count > 0)
4206
->>>>>>> .merge_file_a11592
4189
+                            if (deptmodel != null)
4190
+                              {
4191
+                               if (modlelist != null)
4192
+
4207
                         {
4193
                         {
4208
-                            if (modlelist[0].F_Type == "2")
4209
-                            {
4210
-<<<<<<< .merge_file_a17512
4211
-                                if (modlelist != null)
4212
-                                {
4213
                                     if (modlelist.F_Type == "2")
4194
                                     if (modlelist.F_Type == "2")
4214
                                     {
4195
                                     {
4215
                                         if (deptmodel.F_DeptId == 37)
4196
                                         if (deptmodel.F_DeptId == 37)
4254
 
4235
 
4255
                                     inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//销售内勤-确认返账金额
4236
                                     inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//销售内勤-确认返账金额
4256
                                     }
4237
                                     }
4257
-                                    else if (deptmodel.F_DeptId == 36)
4258
-                                    {
4259
-=======
4260
-                                if (deptmodel.F_DeptId == 37)
4261
-                                {
4262
-                                    inputs.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
4263
-                                }
4264
-                                else if (deptmodel.F_DeptId == 12)
4265
-                                {
4266
-                                    inputs.F_IsVisit = isvisit;
4267
-                                    inputs.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级(未遂、一般、较大、重大)
4268
-                                    inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额(单位元,对应责任单位)
4269
-                                    inputs.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位(需列出,可选多个)
4270
-                                    inputs.F_ZL_ApprovalOpinions = deptment.ApprovalOpinions;// 质量管理科-审批意见(同意、不同意,若选择不同意,增加输入框输入补充内容)
4271
-                                    inputs.F_ZL_ApprovalDisagree = deptment.ApprovalDisagree;// 质量管理科-审批不同意意见
4272
-                                    inputs.F_ZL_CompensationMethod = deptment.CompensationMethod;// 质量管理科-补偿方式(实物、钱款【单位元】,若选择钱款,增加输入框输入补充内容)
4273
-                                    inputs.F_ZL_CompensationMoney = deptment.CompensationMoney;// 质量管理科-补偿钱款
4274
-                                    inputs.F_ZL_CResponsibleUnits = deptment.CResponsibleUnits;//质量管理科-对应责任单位(生产、研发、农化、物流、质量管理科,销售内勤)
4275
->>>>>>> .merge_file_a11592
4276
-                                    inputs.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量(吨)
4277
-                                    inputs.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;//  质量管理科-改进要求
4278
-                                    inputs.F_ZL_CApprovalNo = deptment.CApprovalNo;// 质量管理科-对应审批工作流单号
4279
-
4280
-                                }
4281
-                            }
4282
-                            else if (modlelist[0].F_Type == "3")
4283
-                            {
4284
-                                if (deptmodel.F_DeptId == 37)
4285
-                                {
4286
-                                    inputs.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果(视同合格、合格、不合格、复检后合格、未送检)
4287
-                                    inputs.F_SC_CJ_SelfResult = deptment.SelfResult;//市场管理科-抽检-自检结果
4288
-                                    inputs.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
4289
-                                    inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
4290
-                                }
4291
-                                else if (deptmodel.F_DeptId == 12)
4292
-                                {
4293
-                                    inputs.F_IsVisit = isvisit;
4294
-                                    inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
4295
-                                    inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额(单位元,对应责任单位)
4296
-                                }
4297
-                            }
4298
-                            if (deptmodel.F_DeptId == 25)
4299
-                            {
4300
-
4301
-                                inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//销售内勤-确认返账金额
4302
-                            }
4303
-                            else if (deptmodel.F_DeptId == 36)
4304
-                            {
4305
-                                inputs.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量(吨)
4306
-                            }
4238
+                                   else if (deptmodel.F_DeptId == 36)
4239
+                                   {
4240
+                                     inputs.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量(吨)
4241
+                                   }
4307
                         }
4242
                         }
4308
                         else
4243
                         else
4309
                             return Error("工单不存在!");
4244
                             return Error("工单不存在!");
4312
                     {
4247
                     {
4313
                         return Error("请选择接收部门");
4248
                         return Error("请选择接收部门");
4314
                     }
4249
                     }
4315
-                    //}
4316
-
4317
-<<<<<<< .merge_file_a17512
4250
+  
4318
                         if (modlelist != null)
4251
                         if (modlelist != null)
4319
                         {
4252
                         {
4320
-=======
4321
-                    if (modlelist[0] != null && modlelist.Count > 0)
4322
-                    {
4323
->>>>>>> .merge_file_a11592
4253
+
4324
                         string deptname = "";
4254
                         string deptname = "";
4325
                         //var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
4255
                         //var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
4326
                         if (deptmodel != null)
4256
                         if (deptmodel != null)
4327
                         {
4257
                         {
4328
                             deptname = deptmodel.F_DeptName + "-";
4258
                             deptname = deptmodel.F_DeptName + "-";
4329
                         }
4259
                         }
4330
-<<<<<<< .merge_file_a17512
4260
+
4331
                         AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
4261
                         AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
4332
                         var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
4262
                         var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
4333
                             if (res)
4263
                             if (res)
4337
                         }
4267
                         }
4338
                         else
4268
                         else
4339
                             return Error("工单不存在!");
4269
                             return Error("工单不存在!");
4340
-=======
4341
-                        AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
4342
-                        var res = AssignWO(ua, modlelist[0], inputs, cont, clbm, clid, overtime, sms);
4343
-                        if (res)
4344
-                            return Success("转派成功");
4345
-                        else
4346
-                            return Error("转派失败!");
4347
-                    }
4348
-                    else
4349
-                        return Error("工单不存在!");
4350
-
4351
-
4352
 
4270
 
4353
->>>>>>> .merge_file_a11592
4354
                 }
4271
                 }
4355
                 else
4272
                 else
4356
                     return Error("添加失败!");
4273
                     return Error("添加失败!");