客户档案物料档案对接

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -810,7 +810,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// </summary>
         /// <param name="ids"></param>getunique
         /// <returns></returns>
-        public bool  DelCustomer(string id)
+        public bool  DelCustomers(string id)
         {
               if (cusbll.DeleteList(id))
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/XLXCustomerController.cs

@@ -61,6 +61,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 ajresult.message = "客户唯一标识超出长度";
                 return Process();
             }
+            Model.T_Cus_CustomerBaseNew _Customer = new Model.T_Cus_CustomerBaseNew();
             CustomerNewController cus = new CustomerNewController();
             if (!string.IsNullOrEmpty(customercode))
             {
@@ -73,9 +74,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                   
                 if (cus.getunique(0, customercode))
                 {
-                    ajresult.state = (int)CodeStatus.参数逻辑错误;
-                    ajresult.message = "客户编号已被占用，请重新输入！";
-                    return Process();
+                     _Customer = new BLL.T_Cus_CustomerBaseNew().GetModelList("F_IsDelete=0 and F_CustomerCode='" + customercode + "'")
+              .FirstOrDefault();
                 }
             }
             else
@@ -152,10 +152,22 @@ namespace CallCenterApi.Interface.Controllers.customer
           
             if (!t_Cus_Customerrecords.ExistsCuscodeuuid(uuid))  //uuid不存在时,防止重复添加
             {
-                int  cusid = cus .CustemweCode(customercode, gender.ToString (),
-                companyname, area, branch, salesman, salesphone, channel, credit, customername
-                , customerphone, province, city, country, township, addressfull, brands, product
-                , isrunxlx, annualsales, formula, raisecrops, plantingarea, fertilizerbrand, remark);
+                int cusid = 0;
+                if (_Customer != null)
+                {
+                    cusid = cus.CustemweCode(customercode, gender.ToString(),
+               companyname, area, branch, salesman, salesphone, channel, credit, customername
+               , customerphone, province, city, country, township, addressfull, brands, product
+               , isrunxlx, annualsales, formula, raisecrops, plantingarea, fertilizerbrand, remark, _Customer.F_CustomerId );
+                }
+                else
+                {
+                    cusid = cus.CustemweCode(customercode, gender.ToString(),
+               companyname, area, branch, salesman, salesphone, channel, credit, customername
+               , customerphone, province, city, country, township, addressfull, brands, product
+               , isrunxlx, annualsales, formula, raisecrops, plantingarea, fertilizerbrand, remark);
+                }
+               
                 if (cusid==0)
                 {
                     ajresult.state = (int)CodeStatus.异常结果类型;
@@ -461,7 +473,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 return Process();
             }
             CustomerNewController cus = new CustomerNewController();
-            if (cus .DelCustomer (id .ToString ()))
+            if (cus .DelCustomers(id .ToString ()))
             {
                 cusmodel.F_Cuscode = id.ToString();
                 cusmodel.F_Cuscodeuuid = uuid;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/MaterialManageXLXController.cs

@@ -45,6 +45,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Process();
             }
             MaterialManageController cus = new MaterialManageController();
+            Model.T_Wo_MaterialManage _Customer = new Model.T_Wo_MaterialManage();
             if (!string.IsNullOrEmpty(materialcode))
             {
                 if (!cus.valcode(materialcode))
@@ -56,9 +57,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 if (cus.getunique(0, materialcode))
                 {
-                    ajresult.state = (int)CodeStatus.参数逻辑错误;
-                    ajresult.message = "物料编号已被占用，请重新输入！";
-                    return Process();
+                    _Customer = new BLL.T_Wo_MaterialManage().GetModelList("F_IsDelete=0 and F_MaterialCode='" + materialcode + "'")
+                 .FirstOrDefault(); ;
                 }
             }
             else
@@ -79,11 +79,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 ajresult.message = "安全验证未通过";
                 return Process();
             }
+          
             if (!t_Cus_Customerrecords.ExistsCuscodeuuid(uuid))  //uuid不存在时,防止重复添加
             {
-                int cusid = cus.Add ( materialcode,  materialname,  model,  specs,
-            level1,  level2,  level3,  brand,  materialeffect, 
-           craft,  pipeline,  remark);
+                int cusid = 0;
+                if (_Customer!=null )
+                {
+                    cusid= cus.Add(materialcode, materialname, model, specs,
+           level1, level2, level3, brand, materialeffect,
+          craft, pipeline, remark, _Customer.F_Id );
+                }
+                else
+                {
+                    cusid = cus.Add(materialcode, materialname, model, specs,
+             level1, level2, level3, brand, materialeffect,
+            craft, pipeline, remark);
+
+                }
                 if (cusid == 0)
                 {
                     ajresult.state = (int)CodeStatus.异常结果类型;