瀏覽代碼

代码调整提交。

tangdi 2 年之前
父節點
當前提交
33eeceddf1

+ 7 - 7
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2343,7 +2343,7 @@ namespace Business.ResourceExamineManagement
                 List<string> workOrds = workOrd.Split(",").ToList();
                 if (workOrds.Count == 0)
                 {
-                    return "";
+                    return "未传入工单号,请选择。";
                 }
                 mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => companyid == x.company_id.ToString() && workOrds.Contains(x.morder_no)).Result;
                 //如果工单有今天和之前的,则提示不处理
@@ -2470,10 +2470,10 @@ namespace Business.ResourceExamineManagement
                     workords = workords.Substring(1, workords.Length - 1);
                     await CreatePickBill(workords, mo_Mes_Morders[0].factory_id.GetValueOrDefault().ToString());
                 }
-                return JsonConvert.SerializeObject("ok");
+                return "ok";
             }
             else {
-                return JsonConvert.SerializeObject("没有需要检查的工单");
+                return "没有需要检查的工单";
             }
         }
 
@@ -3362,7 +3362,7 @@ namespace Business.ResourceExamineManagement
             List<string> workOrds = workOrd.Split(",").ToList();
             if (workOrds.Count == 0)
             {
-                return "";
+                return "没有需要排产的工单。";
             }
             //获取工单数据
             var workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd) && p.Domain == domain);
@@ -3372,12 +3372,12 @@ namespace Business.ResourceExamineManagement
             workOrdMasters = workOrdMasters.Where(p => !dbWorkOrds.Contains(p.WorkOrd)).ToList();
             if (workOrdMasters.Count == 0)
             {
-                return JsonConvert.SerializeObject("ok");
+                return "当前工单已排产,无需重新排产。";
             }
             //排产
             await _productionScheduleAppService.DoProductShcedule(workOrdMasters, workOrdMasters[0].Domain);
             //AutoCreatePickBill(workOrdMasters.Select(p => p.WorkOrd).ToList());
-            return JsonConvert.SerializeObject("ok");
+            return "ok";
         }
 
         /// <summary>
@@ -3397,7 +3397,7 @@ namespace Business.ResourceExamineManagement
                 workOrds = workOrd.Split(",").ToList();
                 if (workOrds.Count == 0)
                 {
-                    return JsonConvert.SerializeObject("没有需要下达的工单。");
+                    return "没有需要下达的工单。";
                 }
                 workOrdMasters = _workOrdMaster.Select(p => p.Domain == domain && workOrds.Contains(p.WorkOrd) && p.Status != "r" && p.Status != "c");
             }