版本结束

ZR.Service/mes/pro/ProWorkorderServiceV2.cs

@@ -1,7 +1,7 @@
 using Infrastructure.Attribute;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using SqlSugar;
+
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -25,6 +25,7 @@ using MiniExcelLibs;
 using System.IO;
 using SqlSugar.Extensions;
 using ZR.Model.mes.pro;
+using SqlSugar;
 
 namespace ZR.Service.mes.pro
 {
@@ -95,7 +96,7 @@ namespace ZR.Service.mes.pro
                 {
                     item.Id = "WO" + DateTime.Now.ToString("yyyyMMdd") + max_id.ToString("000");
                     item.Remark4 = "Excel导入";
-                    // 添加属性
+                    // 添加属性 ------》 排序规则是 年周日+序列号（000）
                     item.Sort = Convert.ToInt32(item.Year.ToString("0000").Substring(2) + item.Week.ToString("00") + item.Date.ToString("00") + workorderList.IndexOf(item).ToString("000"));
 
                     if (item.Remark2 == "批量")
@@ -274,8 +275,8 @@ namespace ZR.Service.mes.pro
         /// <summary>
         /// 更改工单顺序
         /// </summary>
-        /// <param name="id"></param>
-        /// <param name="sort"></param>
+        /// <param name="id">工单id</param>
+        /// <param name="sort">新位置占据的排序值</param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
         public int UpdateworkorderSort(string id, int sort)
@@ -285,7 +286,9 @@ namespace ZR.Service.mes.pro
                 int finalreuslt = 0;
 
                 int max = Convert.ToInt32(sort.ToString().Substring(0, 6) + "999");
+
                 int result = Context.Updateable<ProWorkorder_v2>().Where(it => it.Sort >= sort && it.Sort <= max).SetColumns(it => it.Sort == it.Sort + 1).ExecuteCommand();
+               
                 if (result > 0)
                 {
                     finalreuslt = Context.Updateable<ProWorkorder_v2>().Where(it => it.Id == id).SetColumns(it => it.Sort == sort).ExecuteCommand();
@@ -339,8 +342,12 @@ namespace ZR.Service.mes.pro
         {
             if (year > 0 && week > 0 && date >0)
             {
-                string date_now = DateTime.Now.ToString("yyMMdd");
 
+                DateTime week_first = GetWeekStartTime(year, week);
+
+                string date_now = week_first.AddDays(date-1).ToString("yyMMdd");
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.WriteLine($"生成工单号前缀{date_now}");
                 List<ProWorkorder_v2>   workorderList= Context.Queryable<ProWorkorder_v2>().Where(it => it.Year == year && it.Week == week && it.Date == date).Where(it=>it.Remark3=="是").ToList();
                 
                 foreach(ProWorkorder_v2 item in workorderList) {
@@ -353,5 +360,42 @@ namespace ZR.Service.mes.pro
             }
            return 0;
         }
+
+        /// <summary>
+        /// 它接受年份和一年中的周数和星期几作为输入，并返回对应的日期。
+        /// </summary>
+        /// <param name="year"></param>
+        /// <param name="week"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        static DateTime GetDateFromWeek(int year, int weekNumber, DayOfWeek dayOfWeek)
+        {
+            DateTime jan1 = new DateTime(year, 1, 1);
+            int daysOffset = (int)dayOfWeek- (int)jan1.DayOfWeek;
+
+            DateTime firstDayOfWeek = jan1.AddDays(7 * (weekNumber - 1) - daysOffset+2);
+            return firstDayOfWeek;
+        }
+
+        /// <summary>
+        /// 当前周的第一天(星期一)
+        /// </summary>
+        /// <param name="yearWeek">周数，格式：yyyywww</param>
+        /// <returns></returns>
+        private DateTime GetWeekStartTime(int year,int weekNum)
+        {
+            
+            //本年1月1日
+            DateTime firstOfYear = new DateTime(year, 1, 1);
+            //周数
+        
+            //本年1月1日与本周星期一相差的天数
+            int dayDiff = (firstOfYear.DayOfWeek == DayOfWeek.Sunday ? 7 : Convert.ToInt32(firstOfYear.DayOfWeek)) - 1;
+            //第一周的星期一
+            DateTime firstDayOfFirstWeek = firstOfYear.AddDays(-dayDiff);
+            //当前周的星期一
+            DateTime firstDayOfThisWeek = firstDayOfFirstWeek.AddDays((weekNum - 1) * 7);
+            return firstDayOfThisWeek;
+        }
     }
 }