物料修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -45,7 +45,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (modelList.Count > 0)
                     return Success("加载成功", modelList);
             }
-            return Error("加载失败");
+            return Success(null );
         }
         /// <summary>
         /// 获取大区分公司
@@ -63,7 +63,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 else
                 {
-                    return Error("加载失败");
+                    return Success(null );
                 }
                
             }
@@ -76,8 +76,8 @@ namespace CallCenterApi.Interface.Controllers
                     if (dt.Rows .Count > 0)
                         return Success("加载成功", dt);
                 }
-                return Error("加载失败");
-            }
+            return Success(null);
+        }
         /// <summary>
         /// 获取部门
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -2250,17 +2250,36 @@ namespace CallCenterApi.Interface.Controllers.weixin
         private bool IsMaterial(WorkOrderNewInput input)
         {
             bool n = false;
-            if (!string.IsNullOrEmpty(input.F_MaterialID) && !string.IsNullOrEmpty(input.F_MaterialName)
-               && !string.IsNullOrEmpty(input.F_Model) && !string.IsNullOrEmpty(input.F_Specs)
-                && !string.IsNullOrEmpty(input.F_Level1) && !string.IsNullOrEmpty(input.F_Level2)
-              && !string.IsNullOrEmpty(input.F_Level3) && !string.IsNullOrEmpty(input.F_Brand)
-              && !string.IsNullOrEmpty(input.F_MaterialEffect) && !string.IsNullOrEmpty(input.F_Craft)
-              && !string.IsNullOrEmpty(input.F_Pipeline))
+            if (!string.IsNullOrEmpty(input.F_MaterialID) || !string.IsNullOrEmpty(input.F_MaterialName)
+               || !string.IsNullOrEmpty(input.F_Model) || !string.IsNullOrEmpty(input.F_Specs)
+                || !string.IsNullOrEmpty(input.F_Level1) || !string.IsNullOrEmpty(input.F_Level2)
+              || !string.IsNullOrEmpty(input.F_Level3) || !string.IsNullOrEmpty(input.F_Brand)
+              || !string.IsNullOrEmpty(input.F_MaterialEffect) || !string.IsNullOrEmpty(input.F_Craft)
+              || !string.IsNullOrEmpty(input.F_Pipeline))
             {
                 n = true;
             }
             return n;
         }
+        private void AddMait(WorkOrderNewInput input, string usercode)
+        {
+            Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
+            dModel.F_MaterialCode = input.F_MaterialID.ToString();//物料编号
+            dModel.F_MaterialName = input.F_MaterialName;//物料名称
+            dModel.F_Model = input.F_Model;//型号
+            dModel.F_Specs = input.F_Specs;//规格
+            dModel.F_Level1 = input.F_Level1;//一级分类
+            dModel.F_Level2 = input.F_Level2;//二级分类
+            dModel.F_Level3 = input.F_Level3;//三级分类
+            dModel.F_Brand = input.F_Brand;//品牌
+            dModel.F_MaterialEffect = input.F_MaterialEffect;//复合肥肥效
+            dModel.F_Craft = input.F_Craft;//工艺
+            dModel.F_Pipeline = input.F_Pipeline;//产品线
+            dModel.F_IsDelete = 0;
+            dModel.F_CreateOn = DateTime.Now;
+            dModel.F_CreateBy = usercode;
+            int f = mmBLL.Add(dModel);
+        }
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
@@ -2273,13 +2292,25 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             var newmodel = model;
             if (input.F_ID != 0)
+            {
                 model.F_ID = input.F_ID;
+
+            }
             else
+            {
                 model.F_ID = model.F_ID;//工单ID
-            if (!string.IsNullOrWhiteSpace(input.F_WorkOrderCode))
-                model.F_WorkOrderCode = input.F_WorkOrderCode;//工单编号
-            else
+
+            }
+            if (type == 2)
+            {
                 model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");  //工单编号  
+                model.F_Source = model.F_Source;
+            }
+            else
+            {
+                model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
+                model.F_Source = model.F_Source.ToString();//工单来源
+            }
             if (type == 2)
             {
                 if (input.F_Type == 2||input.F_Type == 3)
@@ -2308,32 +2339,27 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //    #endregion
                     //    int b = customerBaseBLL.Add(Customer);
                     //}
-                    if (string.IsNullOrEmpty(input.F_MaterialID) && IsMaterial(input))
+                    if (IsMaterial(input))
                     {
-                        while (true)
+                        if (string.IsNullOrEmpty(input.F_MaterialID))
+                        {
+                            while (true)
+                            {
+                                if (!gematerque(0, GetIntCode()))
+                                {
+                                    input.F_MaterialID = GetIntCode();
+                                    AddMait(input, usercode);
+                                    break;
+                                }
+                            }
+                        }
+                        else
                         {
-                            if (!getunique(0, GetIntCode()))
+                            if (!gematerque(0, input.F_MaterialID))
                             {
-                                input.F_MaterialID = GetIntCode();
-                                break;
+                                AddMait(input, usercode);
                             }
                         }
-                        Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
-                        dModel.F_MaterialCode = input.F_MaterialID.ToString();//物料编号
-                        dModel.F_MaterialName = input.F_MaterialName;//物料名称
-                        dModel.F_Model = input.F_Model;//型号
-                        dModel.F_Specs = input.F_Specs;//规格
-                        dModel.F_Level1 = input.F_Level1;//一级分类
-                        dModel.F_Level2 = input.F_Level2;//二级分类
-                        dModel.F_Level3 = input.F_Level3;//三级分类
-                        dModel.F_Brand = input.F_Brand;//品牌
-                        dModel.F_MaterialEffect = input.F_MaterialEffect;//复合肥肥效
-                        dModel.F_Craft = input.F_Craft;//工艺
-                        dModel.F_Pipeline = input.F_Pipeline;//产品线
-                        dModel.F_IsDelete = 0;
-                        dModel.F_CreateOn = DateTime.Now;
-                        dModel.F_CreateBy = ua.F_UserCode;
-                        int f = mmBLL.Add(dModel);
                     }
                 }
                 
@@ -2482,7 +2508,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     return Error("无操作权限！");
                 }
-                    if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
                     {
                         return Error("请输入正确的生产批次号！");
                     }
@@ -3738,7 +3764,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }

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

@@ -2010,19 +2010,59 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
         }
-        private List <Model .T_Wo_WorkOrderItem_New > ItemList(List<Model.T_Wo_WorkOrderItem_New> list)
+        private List <ItemListLog> ItemList(List<Model.T_Wo_WorkOrderItem_New> list)
         {
-            List<Model.T_Wo_WorkOrderItem_New> Modellist = new List<T_Wo_WorkOrderItem_New>();
+            List< ItemListLog> Modellist = new List<ItemListLog>();
           
             foreach (var it in list)
             {
+                ItemListLog log = new ItemListLog();
+               
+                log.F_ID = it.F_ID;
+                if (it.F_WoID>0)
+                {
+                    if (workOrder.GetModel(it.F_WoID)!=null )
+                    {
+                        log.F_WoID = workOrder.GetModel(it.F_WoID).F_WorkOrderCode;
+                    }
+                }
+                  
+                log.F_WoState = it.F_WoState;
+                log.F_ItemType = it.F_ItemType;
+                log.F_OptType = it.F_OptType;
+                log.F_OptContent = it.F_OptContent;
+                log.F_IsUsed = it.F_IsUsed;
+                log.F_LimitTime = it.F_LimitTime;
+                log.F_IsSMS = it.F_IsSMS;
+                log.F_SMSToUser = it.F_SMSToUser;
+                log.F_SMSToPhone = it.F_SMSToPhone;
+                log.F_SMSContent = it.F_SMSContent;
+                log.F_CreateTime = it.F_CreateTime;
                 string username = "";
                 if (!string.IsNullOrEmpty (it .F_CreateUser ))
                 {
-                    username = sysUserAccountBll.GetModel(it.F_CreateUser).F_UserName;
-                    it.F_CreateUser = it.F_CreateUser + "(" + username + ")";
+                    if (sysUserAccountBll.GetModel(it.F_CreateUser)!=null )
+                    {
+                        username = sysUserAccountBll.GetModel(it.F_CreateUser).F_UserName;
+                        log.F_CreateUser = it.F_CreateUser + "(" + username + ")";
+                    }
                 }
-                Modellist.Add(it);
+                if (!string.IsNullOrEmpty(it.F_NextUser ))
+                {
+                    if (sysUserAccountBll.GetModel(it.F_NextUser)!=null )
+                    {
+                        log.F_NextUser = it.F_NextUser + "(" + sysUserAccountBll.GetModel(it.F_NextUser).F_UserName + ")";
+                    }
+                }
+                if (it.F_NextDept >0)
+                {
+                    if (departmentBLL.GetModel(int.Parse(it.F_NextDept.ToString()))!=null )
+                      {
+                        log.F_NextDept = departmentBLL.GetModel(int.Parse(it.F_NextDept.ToString())).F_DeptName;
+                    }
+                  
+                }
+                Modellist.Add(log);
             }
             return Modellist;
         }
@@ -2046,7 +2086,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             state = "success",
                             message = "成功",
-                            rows = itemlasts,
+                            rows = ItemList(itemlasts),
                             total = itemlasts.Count,
                         };
                         return Content(obj.ToJson());
@@ -3085,7 +3125,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
@@ -3307,7 +3347,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
@@ -3924,17 +3964,36 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private bool IsMaterial(WorkOrderNewInput input)
         {
             bool n= false;
-            if (!string .IsNullOrEmpty (input.F_MaterialID)&& !string.IsNullOrEmpty(input.F_MaterialName)
-               && !string.IsNullOrEmpty(input.F_Model) && !string.IsNullOrEmpty(input.F_Specs)
-                && !string.IsNullOrEmpty(input.F_Level1) && !string.IsNullOrEmpty(input.F_Level2)
-              && !string.IsNullOrEmpty(input.F_Level3) && !string.IsNullOrEmpty(input.F_Brand)
-              && !string.IsNullOrEmpty(input.F_MaterialEffect) && !string.IsNullOrEmpty(input.F_Craft)
-              && !string.IsNullOrEmpty(input.F_Pipeline))
+            if (!string .IsNullOrEmpty (input.F_MaterialID)|| !string.IsNullOrEmpty(input.F_MaterialName)
+               || !string.IsNullOrEmpty(input.F_Model) || !string.IsNullOrEmpty(input.F_Specs)
+                || !string.IsNullOrEmpty(input.F_Level1) || !string.IsNullOrEmpty(input.F_Level2)
+              || !string.IsNullOrEmpty(input.F_Level3) || !string.IsNullOrEmpty(input.F_Brand)
+              || !string.IsNullOrEmpty(input.F_MaterialEffect) || !string.IsNullOrEmpty(input.F_Craft)
+              || !string.IsNullOrEmpty(input.F_Pipeline))
             {
                 n = true;
             }
             return n;
         }
+        private void AddMait(WorkOrderNewInput input,string usercode)
+        {
+            Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
+            dModel.F_MaterialCode = input.F_MaterialID.ToString();//物料编号
+            dModel.F_MaterialName = input.F_MaterialName;//物料名称
+            dModel.F_Model = input.F_Model;//型号
+            dModel.F_Specs = input.F_Specs;//规格
+            dModel.F_Level1 = input.F_Level1;//一级分类
+            dModel.F_Level2 = input.F_Level2;//二级分类
+            dModel.F_Level3 = input.F_Level3;//三级分类
+            dModel.F_Brand = input.F_Brand;//品牌
+            dModel.F_MaterialEffect = input.F_MaterialEffect;//复合肥肥效
+            dModel.F_Craft = input.F_Craft;//工艺
+            dModel.F_Pipeline = input.F_Pipeline;//产品线
+            dModel.F_IsDelete = 0;
+            dModel.F_CreateOn = DateTime.Now;
+            dModel.F_CreateBy = usercode;
+            int f = mmBLL.Add(dModel);
+        }
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
@@ -3960,7 +4019,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else
             {
                 model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
-                model.F_Source = input.F_Source.ToString();//工单来源
+                model.F_Source = model.F_Source.ToString();//工单来源
             }
                 #region 基本字段
                 if (type == 2)
@@ -3993,32 +4052,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //    #endregion
                     //    int b = cusbll.Add(Customer);
                     //  }
-                    if (string.IsNullOrEmpty(input.F_MaterialID)&& IsMaterial(input))
+                    if ( IsMaterial(input))
                     {
-                        while (true)
+                        if (string.IsNullOrEmpty(input.F_MaterialID))
                         {
-                            if (!gematerque(0, GetIntCode()))
+                            while (true)
                             {
-                                input.F_MaterialID = GetIntCode();
-                                break;
+                                if (!gematerque(0, GetIntCode()))
+                                {
+                                    input.F_MaterialID = GetIntCode();
+                                    AddMait(input, usercode);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (!gematerque(0, input.F_MaterialID))
+                            {
+                                AddMait(input, usercode);
                             }
                         }
-                        Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
-                        dModel.F_MaterialCode = input.F_MaterialID.ToString();//物料编号
-                        dModel.F_MaterialName = input.F_MaterialName;//物料名称
-                        dModel.F_Model = input.F_Model;//型号
-                        dModel.F_Specs = input.F_Specs;//规格
-                        dModel.F_Level1 = input.F_Level1;//一级分类
-                        dModel.F_Level2 = input.F_Level2;//二级分类
-                        dModel.F_Level3 = input.F_Level3;//三级分类
-                        dModel.F_Brand = input.F_Brand;//品牌
-                        dModel.F_MaterialEffect = input.F_MaterialEffect;//复合肥肥效
-                        dModel.F_Craft = input.F_Craft;//工艺
-                        dModel.F_Pipeline = input.F_Pipeline;//产品线
-                        dModel.F_IsDelete = 0;
-                        dModel.F_CreateOn = DateTime.Now;
-                        dModel.F_CreateBy = usercode;
-                        int f = mmBLL.Add(dModel);
                     }
                 }
             }
@@ -4182,8 +4236,29 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if (input.F_State == 2 && !vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
                     return Error("请输入正确的工单批次号！");
+                else
+                {
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber))
+                    {
+                        var prono = input.F_BatchNumber.Substring(0, 6);
+                        try
+                        {
+                            var pronos = DateTime.ParseExact(prono, "yyMMdd", null).ToString("yyyy-MM-dd");
+                            var protime = Convert.ToDateTime(pronos);
+                            if (DateTime.Parse(pronos) > DateTime.Now)
+                            {
+                                return Error("生产批次号错误，生产日期不能大于当前时间！");
+                            }
+
+                        }
+                        catch
+                        {
+                            return Error("生产批次号错误，日期格式错误！");
+                        }
+                    }
+                }
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
@@ -4323,8 +4398,29 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if (input.F_State == 2 && !vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
                     return Error("请输入正确的工单批次号！");
+                else
+                {
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber))
+                    {
+                        var prono = input.F_BatchNumber.Substring(0, 6);
+                        try
+                        {
+                            var pronos = DateTime.ParseExact(prono, "yyMMdd", null).ToString("yyyy-MM-dd");
+                            var protime = Convert.ToDateTime(pronos);
+                            if (DateTime.Parse(pronos) > DateTime.Now)
+                            {
+                                return Error("生产批次号错误，生产日期不能大于当前时间！");
+                            }
+
+                        }
+                        catch
+                        {
+                            return Error("生产批次号错误，日期格式错误！");
+                        }
+                    }
+                }
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
@@ -5758,4 +5854,132 @@ public class WorkOrdeDeptment
     {
         get; set;
     }
+}
+public class ItemListLog
+{
+    public long F_ID
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 工单ID
+    /// </summary>
+    public string   F_WoID
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 工单状态
+    /// </summary>
+    public int? F_WoState
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 记录类型 1工单处理，2工单催办
+    /// </summary>
+    public int? F_ItemType
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 操作类型
+    /// </summary>
+    public int? F_OptType
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 操作内容
+    /// </summary>
+    public string F_OptContent
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 下一步操作人
+    /// </summary>
+    public string F_NextUser
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 下一步操作部门
+    /// </summary>
+    public string  F_NextDept
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 是否在用，0是 1否
+    /// </summary>
+    public int? F_IsUsed
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 时限
+    /// </summary>
+    public string F_LimitTime
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 是否短信提醒
+    /// </summary>
+    public int? F_IsSMS
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 短信提醒人
+    /// </summary>
+    public string F_SMSToUser
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 短信提醒电话
+    /// </summary>
+    public string F_SMSToPhone
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 短信提醒内容
+    /// </summary>
+    public string F_SMSContent
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 创建人
+    /// </summary>
+    public string F_CreateUser
+    {
+        set;
+        get;
+    }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? F_CreateTime
+    {
+        set;
+        get;
+    }
 }