分支

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_MaterialItems.cs

@@ -52,7 +52,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_LoadingFee", SqlDbType.Decimal,9),
                     new SqlParameter("@F_UnLoadingFee", SqlDbType.Decimal,9),
                     new SqlParameter("@F_MaterialFee", SqlDbType.Decimal,9),
-                    new SqlParameter("@F_ReturnQuantity", SqlDbType.Int,4),
+                    new SqlParameter("@F_ReturnQuantity",  SqlDbType.Decimal,9),
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
                     new SqlParameter("@F_CreateBy", SqlDbType.VarChar,50),
@@ -105,7 +105,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_LoadingFee", SqlDbType.Decimal,9),
                     new SqlParameter("@F_UnLoadingFee", SqlDbType.Decimal,9),
                     new SqlParameter("@F_MaterialFee", SqlDbType.Decimal,9),
-                    new SqlParameter("@F_ReturnQuantity", SqlDbType.Int,4),
+                    new SqlParameter("@F_ReturnQuantity",  SqlDbType.Decimal,9),
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
                     new SqlParameter("@F_CreateBy", SqlDbType.VarChar,50),
@@ -244,7 +244,7 @@ namespace CallCenterApi.DAL
                 }
                 if (row["F_ReturnQuantity"] != null && row["F_ReturnQuantity"].ToString() != "")
                 {
-                    model.F_ReturnQuantity = int.Parse(row["F_ReturnQuantity"].ToString());
+                    model.F_ReturnQuantity = decimal.Parse(row["F_ReturnQuantity"].ToString());
                 }
                 if (row["F_WoID"] != null && row["F_WoID"].ToString() != "")
                 {

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

@@ -5464,69 +5464,85 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }      
                         model.F_Flag = flag;
                         var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextUser like '%{ua.F_UserCode}%' and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
-                        if (flag == 3)
+                        #region 咨询、建议、抽检类工单变更为单线流转
+                        if (model.F_Type == "1" || model.F_Type == "3" || model.F_Type == "4")
                         {
-                            if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
-                            {
-                                return Error("请选择接收部门");
-
-                            }
-                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag,Supercont);
-                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
 
-                        }
-                        else if (flag == 2)
-                        {
-                            if (clbm2 == 0 && clid2 == 0)
+                            if (clbm == 0 && clid == 0)
                             {
                                 return Error("请选择接收部门");
-                            }                          
-                            if (opttype == 2) //填写处理结果
-                            {
-                                flag = 3;
-                                DealWO(ua, model,"", input, cont2, 1, "", 1,"", flag,isApprovalp);
-                            }
-                            else if (opttype == 3) // 待处理状态
-                            {
-                                flag = 3;
-                                modellast.F_Type = 1;
-                                modellast.F_Flag = flag;
-                                modellast.F_NextDept = 0;
-                                itembll.Update(modellast);
                             }
-                            else //完结工单
-                            {
-                                Overorder(ua, model, 1);
-                            }
-                            model.F_Flag = flag;
-                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag,Supercont);                        
+                            Overorder(ua, model, 2);
+                            model.F_Flag = 1;
+                            AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, 1, Supercont);
                         }
+                        #endregion
                         else
                         {
-                            if (clbm == 0 && clid == 0)
-                            {
-                                return Error("请选择接收部门");
-                            }
-                            if (opttype == 2) //填写处理结果
+                            if (flag == 3)
                             {
-                                flag = 3;
-                                DealWO(ua, model,"", input, cont2, 1, "", 2,"", flag,isApprovalp);
+                                if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
+                                {
+                                    return Error("请选择接收部门");
+
+                                }
+                                var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
+                                var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
+
                             }
-                            else if (opttype == 3) // 待处理状态
+                            else if (flag == 2)
                             {
-                                flag = 3;
-                                modellast.F_Type = 2;
-                                modellast.F_Flag = flag;
-                                modellast.F_NextDept = 0;
-                                itembll.Update(modellast);
+                                if (clbm2 == 0 && clid2 == 0)
+                                {
+                                    return Error("请选择接收部门");
+                                }
+                                if (opttype == 2) //填写处理结果
+                                {
+                                    flag = 3;
+                                    DealWO(ua, model, "", input, cont2, 1, "", 1, "", flag, isApprovalp);
+                                }
+                                else if (opttype == 3) // 待处理状态
+                                {
+                                    flag = 3;
+                                    modellast.F_Type = 1;
+                                    modellast.F_Flag = flag;
+                                    modellast.F_NextDept = 0;
+                                    itembll.Update(modellast);
+                                }
+                                else //完结工单
+                                {
+                                    Overorder(ua, model, 1);
+                                }
+                                model.F_Flag = flag;
+                                var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
                             }
-                            else //完结工单
+                            else
                             {
-                                Overorder(ua, model, 2);
+                                if (clbm == 0 && clid == 0)
+                                {
+                                    return Error("请选择接收部门");
+                                }
+                                if (opttype == 2) //填写处理结果
+                                {
+                                    flag = 3;
+                                    DealWO(ua, model, "", input, cont2, 1, "", 2, "", flag, isApprovalp);
+                                }
+                                else if (opttype == 3) // 待处理状态
+                                {
+                                    flag = 3;
+                                    modellast.F_Type = 2;
+                                    modellast.F_Flag = flag;
+                                    modellast.F_NextDept = 0;
+                                    itembll.Update(modellast);
+                                }
+                                else //完结工单
+                                {
+                                    Overorder(ua, model, 2);
+                                }
+                                model.F_Flag = flag;
+                                var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
+
                             }
-                            model.F_Flag = flag;
-                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
-                          
                         }
                         return Success("转派成功");
                     }