新流程（不发运，不能打印新单据）开发前

2 days ago · ec1383591d
39 changed files with 1210 additions and 162 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,6 @@
 /*.rar
+packages
+.vs
+bin
+obj
+~bak
--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Handlers/Handler1.ashx.cs
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Handlers/Handler1.ashx.cs
@ -26,28 +26,28 @@ namespace WebApplicationGridJJReport.Handlers


            string reportType = context.Request.QueryString["report"].ToLower();
-            if (reportType == "menban")
+            //if (reportType == "menban")
            {
                if (string.IsNullOrEmpty(text))
                {
                    text = PostParam.MenBanVal.Replace("'", "\"");
                }
            }
-            else if (reportType == "zhuhuban")
-            {
-                if (string.IsNullOrEmpty(text))
-                {
-                    text = PostParam.ZhuHuBanVal.Replace("'", "\"");
-                }
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(text))
-                {
-                    text = PostParam.ZhuHuBanVal.Replace("'", "\"");
-                }
+            //else if (reportType == "zhuhuban")
+            //{
+            //    if (string.IsNullOrEmpty(text))
+            //    {
+            //        text = PostParam.ZhuHuBanVal.Replace("'", "\"");
+            //    }
+            //}
+            //else
+            //{
+            //    if (string.IsNullOrEmpty(text))
+            //    {
+            //        text = PostParam.ZhuHuBanVal.Replace("'", "\"");
+            //    }

-            }
+            //}

            ReportGenerator reportGenerator = new ReportGenerator(context);

--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Web.config
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Web.config
@ -15,3 +15,15 @@
    </compilers>
  </system.codedom>
 </configuration>
+<!--
+测试调用：https ://localhost:44356//Handlers/Handler1.ashx?report=menban&returnfile=1
+客户端调用：
+this.$axios.posts("/Handlers/Handler1.ashx?report=menban",
+    qs.stringify(this.fileQuery)
+)
+this.fileQuery  是  load-menban-report 方法返回的字符串，然后转换成json
+
+
+https://localhost:44356//Handlers/Handler1.ashx?report=C8-%E6%89%B6%E6%89%8B&returnfile=1
+
+-->
--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/WebApplicationGridJJReport.csproj.user
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/WebApplicationGridJJReport.csproj.user
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <UseIISExpress>true</UseIISExpress>
@ -15,7 +15,7 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
-          <StartPageUrl>/Handlers/Handler1.ashx?report=zhuhuban&amp;returnfile=1</StartPageUrl>
+          <StartPageUrl>/Handlers/Handler1.ashx?report=menban&amp;returnfile=1</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/appcode/PostParam.cs
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/appcode/PostParam.cs
--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-头枕.grf
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-头枕.grf
@ -0,0 +1,353 @@
+{
+	"Version":"6.6.2.0",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+	},
+	"DetailGrid":{
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"knr"
+				},
+				{
+					"Name":"vin"
+				},
+				{
+					"Name":"partcode1"
+				},
+				{
+					"Name":"partcode2"
+				},
+				{
+					"Name":"sn"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"knr"
+			},
+			{
+				"Name":"vin"
+			},
+			{
+				"Name":"partcode1"
+			},
+			{
+				"Name":"partcode2"
+			},
+			{
+				"Name":"sn"
+			}
+		],
+		"ColumnContent":{
+			"Height":1.79917,
+			"ColumnContentCell":[
+				{
+					"Column":"knr",
+					"DataField":"knr"
+				},
+				{
+					"Column":"vin",
+					"DataField":"vin"
+				},
+				{
+					"Column":"partcode1",
+					"DataField":"partcode1"
+				},
+				{
+					"Column":"partcode2",
+					"DataField":"partcode2"
+				},
+				{
+					"Column":"sn",
+					"DataField":"sn"
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0.608542,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"knr",
+					"TextAlign":"MiddleCenter",
+					"Text":"kin号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"vin",
+					"TextAlign":"MiddleCenter",
+					"Text":"底盘号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"partcode1",
+					"TextAlign":"MiddleCenter",
+					"Text":"顶部饰板"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"partcode2",
+					"TextAlign":"MiddleCenter",
+					"Text":"头枕"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"sn",
+					"TextAlign":"MiddleCenter",
+					"Text":"序号"
+				}
+			]
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"vehicleModel"
+		},
+		{
+			"Name":"billNum"
+		},
+		{
+			"Name":"billSerialNum"
+		},
+		{
+			"Name":"printDate"
+		},
+		{
+			"Name":"productLine"
+		},
+		{
+			"Name":"beginVin"
+		},
+		{
+			"Name":"endVin"
+		},
+		{
+			"Name":"knr"
+		},
+		{
+			"Name":"partCode1"
+		},
+		{
+			"Name":"partCode2"
+		},
+		{
+			"Name":"sn"
+		},
+		{
+			"Name":"partCode3"
+		},
+		{
+			"Name":"partCode5"
+		},
+		{
+			"Name":"vin"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"FreeGrid",
+					"Name":"FreeGrid2",
+					"Left":0.079375,
+					"Top":0.3175,
+					"Border":{
+						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+					},
+					"ColumnCount":6,
+					"RowCount":2,
+					"FreeGridColumn":[
+						{
+							"index":1,
+							"Width":1.5875
+						},
+						{
+							"index":2,
+							"Width":1.08479
+						},
+						{
+							"index":4,
+							"Width":5.18583
+						},
+						{
+							"index":5,
+							"Width":0.211667
+						},
+						{
+							"index":6,
+							"Width":4.07458
+						}
+					],
+					"FreeGridRow":[
+					],
+					"FreeGridCell":[
+						{
+							"row":1,
+							"col":1,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"StaticBox",
+									"Name":"StaticBox1",
+									"Width":3.41313,
+									"Height":0.608542,
+									"Text":"GRAMMER-"
+								}
+							]
+						},
+						{
+							"row":1,
+							"col":2,
+							"Text":"[#{vehicleModel}#]"
+						},
+						{
+							"row":1,
+							"col":3,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox1",
+									"Left":1.19063,
+									"Width":6.40292,
+									"Height":0.396875,
+									"Font":{
+										"Name":"宋体",
+										"Size":142500,
+										"Bold":true,
+										"Charset":134
+									},
+									"Text":"[#{billNum}#]"
+								}
+							],
+							"ColSpan":2
+						},
+						{
+							"row":1,
+							"col":5,
+							"FreeCell":true
+						},
+						{
+							"row":1,
+							"col":6,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"Barcode",
+									"Name":"Barcode2",
+									"Left":0.211667,
+									"Width":2.59292,
+									"Height":0.608542
+								}
+							]
+						},
+						{
+							"row":2,
+							"col":1,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":3,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":4,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":5,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":6,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox2",
+									"Left":0.396875,
+									"Width":2.59292,
+									"Height":0.396875,
+									"Text":"[#{billNum}#]"
+								}
+							]
+						}
+					]
+				}
+			]
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":3.20146,
+			"Control":[
+				{
+					"Type":"FreeGrid",
+					"Name":"FreeGrid4",
+					"Left":0.0264583,
+					"Top":0.3175,
+					"Border":{
+						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+					},
+					"RowCount":2,
+					"FreeGridColumn":[
+						{
+							"index":2,
+							"Width":2.43417
+						},
+						{
+							"index":3,
+							"Width":4.60375
+						},
+						{
+							"index":4,
+							"Width":1.74625
+						},
+						{
+							"index":5,
+							"Width":3.57188
+						}
+					],
+					"FreeGridRow":[
+						{
+							"index":2,
+							"Height":1.5875
+						}
+					],
+					"FreeGridCell":[
+						{
+							"row":2,
+							"col":3,
+							"Font":{
+								"Name":"宋体",
+								"Size":180000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"[#{billSerialNum}#]"
+						},
+						{
+							"row":2,
+							"col":5,
+							"Text":"[#{printDate}#]"
+						}
+					]
+				}
+			]
+		}
+	]
+}
--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-扶手.grf
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-扶手.grf
@ -0,0 +1 @@
+BASE64QBYAAHicvVdNj9tEGD6nUv+Eew2WPf6I01uzy24PTYWSVXtYRciNp7sjHDsaO3RLyZFD1UMPCKlSxQEhrogTSCDEn2EXOPEXmBnPjL9mHDcb0UPjfT9n3vd5P+bf3/54dffOwHgCcYbSxLhv+KZvAtMyhpR8kia5cZ9KDIzH4QoS/vWPb/78/WvGHhhz9AWh2ZZnWVZBeQrRxSXRcQXh6DLEGSQU23EJYcvsfoJRkkNcmC5IxzAPUXyKUSQczuAyxRHTZQRyHARjwj5nfw0KYnmyzxJsFCRmUSHxOUp2SKxDnC/TCNo95cAOuUw6ZD8L+v+WByaNN6tE3IYrtu7CDTfY8iJqduMW3UKgS0icnx1/UT34EYEGTMrcPOSJt83ReGyPCmt12SMYx+3siTiwOw8F9TjMQ57ursRKZRoRpXJHzqVyGS+liZ2gaBkC3Ya0qJGGMs1tduLpDOUxbCXFMn0r8FxQywoTVefkFKebNTf1PIwzOOzO1hm8yh/E6IIypiiKqF1W4DUJqoWS67e/6K7fw20tz73dXv/6zV/v393OswIkvf3fvP755vWbAzgHezj/+/uv/vnhp5tvv7uF/2y/qL+thLwC2HIOhJj0GTYJGAQ5bEWXg5doGcMpuXf86THK1kYJ97rkMxTHjzerTv4cYhR2Sq3pVCLVBjsk0mizzB+hRC/zDF6g5AnvOioBmERdbNHtlP4JDI5kJ+qSAFqJTO9aKDs7JTythOi3NMlsYJA5vk5x/hCGkSbPVQFRXdp5kuQ4VXSss5drauoEQ8h2CIlF7kMwKgX0CD5nrdEajZ2RV4I3XVOqY1doE7KIiHWloMzzlzHMiOHzYxy+oKa+pB9Emf3O6OHZ1yTN83S14FUgi68cjRs6RH1JnqUvOA1Imjh8fWWoXJ/IoCSCVyRcw5L0FEX5JY2gF4w8QZYHUCgDlbIVuKNxH223re2ZduAFTh9tr61tmcC2fX/UR91vq7sks64XSG3+sWiFlYS8jGmbXRuRNd+YKlYjvqTQrBKojUI/xxtYYTSBXLdcAnqehzlaTtIrY1jlclRLrl1n8wg4pms7tlNjqVcC4bRo3KezB9Ppx7OPjJK3lZ+LznSoQ1IFFvdxfu9Vq79v78k6+RDrziEDPoWrVBduzmsEu+gjtmmPLd9RpcE3XQuMgSYNztgPRl6NWXl2NY9QfX5JHn+GucDjry7JmaR0bayHYtB+lYl/WxUaSKb4fK3mpwaJWpzj+TokTQrskUlPm8k9jPmHhMUkxHT/UsKC84AKFqKHqXABTG+sx0VRnntWIGgGQ9+U9jCmL7g9jLmHNHYbALWMHRRAPfqKBkCKBtELQAq9/hXdmprFb2OLry54J2mqW+SrAq0FzzGBZbv+oRY8V7HgAZ/sARK0/9uGd8tVTrGNAdN1XLvXQuS0tV3SU5x+m6BilyOLuOuDXtqKXc4xvZEdfOgytiMq5RuhtuFqbe/Y5Lr7XHMm6yeymMeBZdXmsXoaq2dxZRI3qla+Y/ttS50tsrQs3741q93Ff/fO9j/5TWYU
--- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/Q5NF.grf
+++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/Q5NF.grf
@ -0,0 +1,355 @@
+{
+	"Version":"6.6.2.0",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+	},
+	"DetailGrid":{
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"knr"
+				},
+				{
+					"Name":"vin"
+				},
+				{
+					"Name":"partcode1"
+				},
+				{
+					"Name":"partcode2"
+				},
+				{
+					"Name":"sn"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"knr"
+			},
+			{
+				"Name":"vin",
+				"Width":5.37104
+			},
+			{
+				"Name":"partcode1",
+				"Width":5.60917
+			},
+			{
+				"Name":"sn",
+				"Width":1.19063
+			}
+		],
+		"ColumnContent":{
+			"Height":1.79917,
+			"ColumnContentCell":[
+				{
+					"Column":"knr",
+					"DataField":"knr"
+				},
+				{
+					"Column":"vin",
+					"DataField":"vin"
+				},
+				{
+					"Column":"partcode1",
+					"DataField":"partcode1"
+				},
+				{
+					"Column":"sn",
+					"DataField":"sn"
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0.608542,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"knr",
+					"TextAlign":"MiddleCenter",
+					"Text":"kin号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"vin",
+					"TextAlign":"MiddleCenter",
+					"Text":"底盘号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"partcode1",
+					"TextAlign":"MiddleCenter",
+					"Text":"顶部饰板"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"sn",
+					"TextAlign":"MiddleCenter",
+					"Text":"序号"
+				}
+			]
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"vehicleModel"
+		},
+		{
+			"Name":"billNum"
+		},
+		{
+			"Name":"billSerialNum"
+		},
+		{
+			"Name":"printDate"
+		},
+		{
+			"Name":"productLine"
+		},
+		{
+			"Name":"beginVin"
+		},
+		{
+			"Name":"endVin"
+		},
+		{
+			"Name":"knr"
+		},
+		{
+			"Name":"partCode1"
+		},
+		{
+			"Name":"partCode2"
+		},
+		{
+			"Name":"sn"
+		},
+		{
+			"Name":"partCode3"
+		},
+		{
+			"Name":"partCode5"
+		},
+		{
+			"Name":"vin"
+		},
+		{
+			"Name":"direction"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"FreeGrid",
+					"Name":"FreeGrid2",
+					"Left":0.079375,
+					"Top":0.3175,
+					"Border":{
+						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+					},
+					"ColumnCount":7,
+					"RowCount":2,
+					"FreeGridColumn":[
+						{
+							"index":1,
+							"Width":1.5875
+						},
+						{
+							"index":2,
+							"Width":1.08479
+						},
+						{
+							"index":4,
+							"Width":4.60375
+						},
+						{
+							"index":5,
+							"Width":0.211667
+						},
+						{
+							"index":6,
+							"Width":3.41313
+						},
+						{
+							"index":7,
+							"Width":1.24354
+						}
+					],
+					"FreeGridRow":[
+					],
+					"FreeGridCell":[
+						{
+							"row":1,
+							"col":1,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"StaticBox",
+									"Name":"StaticBox1",
+									"Width":3.41313,
+									"Height":0.608542,
+									"Text":"GRAMMER-"
+								}
+							]
+						},
+						{
+							"row":1,
+							"col":2,
+							"Text":"[#{vehicleModel}#]"
+						},
+						{
+							"row":1,
+							"col":3,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox1",
+									"Left":1.19063,
+									"Width":6.40292,
+									"Height":0.396875,
+									"Font":{
+										"Name":"宋体",
+										"Size":142500,
+										"Bold":true,
+										"Charset":134
+									},
+									"Text":"[#{billNum}#]"
+								}
+							],
+							"ColSpan":2
+						},
+						{
+							"row":1,
+							"col":5,
+							"FreeCell":true
+						},
+						{
+							"row":1,
+							"col":6,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"Barcode",
+									"Name":"Barcode2",
+									"Left":0.211667,
+									"Width":2.59292,
+									"Height":0.608542
+								}
+							]
+						},
+						{
+							"row":1,
+							"col":7,
+							"Text":"[#{direction}#]"
+						},
+						{
+							"row":2,
+							"col":1,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":3,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":4,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":5,
+							"FreeCell":true
+						},
+						{
+							"row":2,
+							"col":6,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox2",
+									"Left":0.396875,
+									"Width":2.59292,
+									"Height":0.396875,
+									"Text":"[#{billNum}#]"
+								}
+							]
+						}
+					]
+				}
+			]
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":3.20146,
+			"Control":[
+				{
+					"Type":"FreeGrid",
+					"Name":"FreeGrid4",
+					"Left":0.0264583,
+					"Top":0.3175,
+					"Border":{
+						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+					},
+					"RowCount":2,
+					"FreeGridColumn":[
+						{
+							"index":2,
+							"Width":2.43417
+						},
+						{
+							"index":3,
+							"Width":4.60375
+						},
+						{
+							"index":4,
+							"Width":1.74625
+						},
+						{
+							"index":5,
+							"Width":3.57188
+						}
+					],
+					"FreeGridRow":[
+						{
+							"index":2,
+							"Height":1.5875
+						}
+					],
+					"FreeGridCell":[
+						{
+							"row":2,
+							"col":3,
+							"Font":{
+								"Name":"宋体",
+								"Size":180000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"[#{billSerialNum}#]"
+						},
+						{
+							"row":2,
+							"col":5,
+							"Text":"[#{printDate}#]"
+						}
+					]
+				}
+			]
+		}
+	]
+}
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingListDto.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingListDto.cs
@ -110,7 +110,10 @@ namespace WY.NewJit.Extends
        /// </summary>
        public string EndHostSN { set; get; }

-
+        /// <summary>
+        /// 排序字段
+        /// </summary>
+        public int SN { get; set; }

        public MenBanPackingListDto()
        {
@ -159,6 +162,23 @@ namespace WY.NewJit.Extends

    }

+    public class MenBanPackingListResultDto
+    {
+        public List<MenBanPackingListDto> MainList1 { get; set; }
+
+        public List<MenBanPackingListDto> MainList2 { get; set; }

+        public List<MenBanPackingRecDto> DetailList1 { get; set; }
+
+        public List<MenBanPackingRecDto> DetailList2 { get; set; }
+
+        public MenBanPackingListResultDto()
+        {
+            MainList1 = new List<MenBanPackingListDto>();
+            MainList2 = new List<MenBanPackingListDto>();
+            DetailList1 = new List<MenBanPackingRecDto>();
+            DetailList2 = new List<MenBanPackingRecDto>();
+        }
+    }

 }
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Dtos/DicItemDto.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Dtos/DicItemDto.cs
@ -73,5 +73,19 @@ namespace WY.NewJit.MsgBaseData
        /// </summary>
        public virtual string DicItemSort9 { get; set; }

+        /// <summary>
+        /// 分类10（零件大类对应 是否扫描 1 需要扫描  0 不需要扫描）
+        /// </summary>
+        public virtual string DicItemSort10 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string DicItemSort11 { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string DicItemSort12 { get; set; }
+
    }
 }
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
@ -99,6 +99,11 @@
            顺序号结束
            </summary>
        </member>
+        <member name="P:WY.NewJit.Extends.MenBanPackingListDto.SN">
+            <summary>
+            排序字段
+            </summary>
+        </member>
        <member name="P:WY.NewJit.Extends.MenBanPackingListRequestDto.ProductLine">
            <summary>
            生产线
@ -1000,6 +1005,21 @@
            分类9（零件大类对应 打印标准数量 12 或 24）
            </summary>
        </member>
+        <member name="P:WY.NewJit.MsgBaseData.DicItemDto.DicItemSort10">
+            <summary>
+            分类10（零件大类对应 是否扫描 1 需要扫描  0 不需要扫描）
+            </summary>
+        </member>
+        <member name="P:WY.NewJit.MsgBaseData.DicItemDto.DicItemSort11">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:WY.NewJit.MsgBaseData.DicItemDto.DicItemSort12">
+            <summary>
+            
+            </summary>
+        </member>
        <!-- Badly formed XML comment ignored for member "M:WY.NewJit.MsgBaseData.IDicAppService.GetDicListAsync(System.String)" -->
        <member name="P:WY.NewJit.MsgBaseData.CreateUpdateExcludePartCfgDto.VehicleModelCode">
            <summary>
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs
@ -3865,6 +3865,50 @@ select min(SerialNumStr) from FisBillM100 a  left join d on a.VIN=d.VIN
            }
        }

+        [UnitOfWork]
+        [HttpPost]
+        [Route("load-menban-report2")]
+        public virtual async Task<MenBanPackingListResultDto> LoadMenBanReport2(List<Guid> input)
+        {
+            _logger.LogDebug(_errorMessagePrefix + "LoadMenBanReport2 进入");
+            MenBanPackingListResultDto ret = new MenBanPackingListResultDto();
+            try
+            {
+                List<MenBanPackingListDto> reportLst = await LoadMenBanReport(input);
+
+                List<DicItem> partLargeTypeLst = await _dicItemRepository.GetListAsync(itm => itm.DicTypeCode == "零件大类");
+                foreach (MenBanPackingListDto report in reportLst)
+                {
+                    var partLargeTypeObj = partLargeTypeLst.FirstOrDefault(itm => itm.DicItemSort2 == report.ProductLine && itm.DicItemCode == report.PartType);
+                    if (partLargeTypeObj != null)
+                    {
+                        report.SN = partLargeTypeObj.DicItemSort7.TryToIntZero();
+                    }
+                }
+                reportLst = reportLst.OrderBy(itm => itm.SN).ToList();
+                if (reportLst.Count > 0)
+                {
+                    ret.MainList1.Add(reportLst[0]);
+                    ret.DetailList1.AddRange(reportLst[0].Details);
+                    reportLst[0].Details = null;
+                }
+                if (reportLst.Count > 1)
+                {
+                    ret.MainList2.Add(reportLst[1]);
+                    ret.DetailList2.AddRange(reportLst[1].Details);
+                    reportLst[1].Details = null;
+                }
+                return ret;
+            }
+            catch (Exception ex)
+            {
+                string errorMsg = _errorMessagePrefix + "LoadMenBanReport2 执行出错：" + ex.Message;
+                _logger.LogError(errorMsg);
+                throw new UserFriendlyException(errorMsg);
+            }
+        }
+
+
        private static string GetTrueString(string str)
        {
            return str == null ? " " : str.Trim(); ;
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/MenBanPackingRecService.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/MenBanPackingRecService.cs
@ -225,45 +225,45 @@ namespace Win.Sfs.SettleAccount.FISes
        /// </summary>
        /// <param name="ids">IDs</param>
        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-        [UnitOfWork(isTransactional: false)]
-        public virtual async Task<List<string>> DeleteListAsync(List<Guid> ids)
-        {
-
-            var _list=await _menBanPackingListRepository.Where(p => ids.Contains(p.Id)).ToListAsync();
-            var sortList=_list.Select(p => p.SortId).Distinct().ToList();//筛选出匹配门板
-            _list = _menBanPackingListRepository.Where(p => sortList.Contains(p.SortId)).ToList();
-
-            var idList = _list.Select(p => p.Id).ToList();
-            var _ls=_list.Select(p => p.BillNum).ToList();
-            var _strList = new List<string> ();
-      
-            _ls.ForEach(p=>{
-                _strList.Add(string.Format("'{0}'", p));
-            });
-            string str=string.Join(",", _strList.ToArray());
-            var _lst=_wmsRepository.GetListBySql<TB_BILL>(string.Format("select * from TB_BILL where (state=1 or state=2) and BillNum in ({0}) ", str));
-            if (_lst.Count() == 0)
-            {
-                await _menBanPackingListRepository.DeleteManyAsync(idList.ToArray());
-
-                var _childList = await _menBanPackingListRepository.Where(p => idList.Contains(p.Id)).SelectMany(p => p.Details).ToListAsync();
-                var _child = _childList.Select(p => p.M100BillId).Distinct().ToList();
-                var _lst1= await _billM100Repository.Where(p => _child.Contains(p.Id)).ToListAsync();
-                _lst1.ForEach(p =>
-                {
-                    if (p.BillStatus == BillStatusEnum.Publish)
-                    {
-                        p.SetBillStatus(BillStatusEnum.Match);
-                    }
-
-                });
-                await _billM100Repository.UpdateManyAsync(_lst1);
-               
-            }
-            return _lst.Select(p => p.BillNum).ToList();
-        }
+        //[HttpPost]
+        //[Route("delete")]
+        //[UnitOfWork(isTransactional: false)]
+        //public virtual async Task<List<string>> DeleteListAsync(List<Guid> ids)
+        //{
+
+        //    var _list=await _menBanPackingListRepository.Where(p => ids.Contains(p.Id)).ToListAsync();
+        //    var sortList=_list.Select(p => p.SortId).Distinct().ToList();//筛选出匹配门板
+        //    _list = _menBanPackingListRepository.Where(p => sortList.Contains(p.SortId)).ToList();
+
+        //    var idList = _list.Select(p => p.Id).ToList();
+        //    var _ls=_list.Select(p => p.BillNum).ToList();
+        //    var _strList = new List<string> ();
+      
+        //    _ls.ForEach(p=>{
+        //        _strList.Add(string.Format("'{0}'", p));
+        //    });
+        //    string str=string.Join(",", _strList.ToArray());
+        //    var _lst=_wmsRepository.GetListBySql<TB_BILL>(string.Format("select * from TB_BILL where (state=1 or state=2) and BillNum in ({0}) ", str));
+        //    if (_lst.Count() == 0)
+        //    {
+        //        await _menBanPackingListRepository.DeleteManyAsync(idList.ToArray());
+
+        //        var _childList = await _menBanPackingListRepository.Where(p => idList.Contains(p.Id)).SelectMany(p => p.Details).ToListAsync();
+        //        var _child = _childList.Select(p => p.M100BillId).Distinct().ToList();
+        //        var _lst1= await _billM100Repository.Where(p => _child.Contains(p.Id)).ToListAsync();
+        //        _lst1.ForEach(p =>
+        //        {
+        //            if (p.BillStatus == BillStatusEnum.Publish)
+        //            {
+        //                p.SetBillStatus(BillStatusEnum.Match);
+        //            }
+
+        //        });
+        //        await _billM100Repository.UpdateManyAsync(_lst1);
+               
+        //    }
+        //    return _lst.Select(p => p.BillNum).ToList();
+        //}

        /// <summary>
        /// 取待报废的全部数据，用于展示
@ -286,98 +286,98 @@ namespace Win.Sfs.SettleAccount.FISes
        /// </summary>
        /// <param name="ids">IDs</param>
        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("scrap")]
-        [UnitOfWork(isTransactional: false)]
-        public virtual async Task<List<string>> ScrapAsync(List<Guid> ids)
-        {
-            var selLst = await _menBanPackingListRepository.Where(p => ids.Contains(p.Id)).ToListAsync();
-            if (selLst == null || selLst.Count == 0)
-            {
-                throw new BusinessException("1001", "没有选中要作废的已打印装箱单！");
-            }
-            foreach (var _obj in selLst)
-            {
-                string maxBillNum = await _menBanPackingListRepository.Where(itm => itm.ProductLine == _obj.ProductLine && itm.ReportStatus == ReportStatusEnum.已打印).MaxAsync(itm => itm.BillNum); //取当前生产线的最大装箱单号
-                if (string.IsNullOrEmpty(maxBillNum) == false)
-                {
-                    MenBanPackingList firObj = await _menBanPackingListRepository.FirstOrDefaultAsync(itm => itm.BillNum == maxBillNum);
-                    if (firObj != null)
-                    {
-                        if (_obj.SortId != firObj.SortId)
-                        {
-                            throw new BusinessException("1001", "只能报废当前生产线的最后打印单据，要报废的单据不是最后打印单据！");
-                        }
-                    }
-                }
-            }
-
-            var sortList = selLst.Select(p => p.SortId).Distinct().ToList();//筛选出匹配门板
-            List<MenBanPackingList> pairlist = _menBanPackingListRepository.Where(p => sortList.Contains(p.SortId)).ToList();
-
-
-            var idList = pairlist.Select(p => p.Id).ToList();
-            var _ls = pairlist.Select(p => p.BillNum).ToList();
-            var _strList = new List<string>();
-
-            _ls.ForEach(p => {
-                _strList.Add(string.Format("'{0}'", p));
-            });
-            string str = string.Join(",", _strList.ToArray());
-            var wmsLst = _wmsRepository.GetListBySql<TB_BILL>(string.Format("select top 100 * from TB_BILL with(nolock) where (state=1 or state=2) and BillNum in ({0}) ", str));
-            if (wmsLst.Count() == 0) //库存没有排序
-            {
-                //调用库存系统接口
-                List<string> billNumLst = pairlist.Select(itm => itm.BillNum).Distinct().ToList();
-                foreach (string billNumStr in billNumLst)
-                {
-                    DelOrScrapWMSInterface(billNumStr, true);
-                }
-
-                #region 作废时单据序号减一
-                string curProductLine = selLst[0].ProductLine;
-                DateTime curPrintDate = selLst[0].PrintDate;
-                //string curPartType = selLst[0].PartType;
-                var priorLst = _menBanPackingListRepository.Where(itm => itm.ReportStatus == ReportStatusEnum.已打印 && itm.ProductLine == curProductLine && idList.Contains(itm.Id) == false);
-                if (priorLst.Any())
-                {
-                    string maxBillNum = priorLst.Max(itm => itm.BillNum); //除去要作废记录，取当前生产线的最大单据号
-                    MenBanPackingList priorObj = priorLst.FirstOrDefault(itm => itm.BillNum == maxBillNum); //除去要作废记录，取当前生产线的最后打印记录
-                    double updRecCnt = await _lineSNDomianServic.SetMaxSN(ProductTypeEnum.门板, curProductLine, "", priorObj.PrintDate, priorObj.BillSerialNum.TryToDoubleZero(), null); //调用减号接口
-                }
-                else
-                {
-                    double updRecCnt2 = await _lineSNDomianServic.SetMaxSN(ProductTypeEnum.门板, curProductLine, "", curPrintDate, 0, null); //调用减号接口，没有上条记录时 单据号传0
-                }
-                #endregion
-
-                foreach (var itm in pairlist)
-                {
-                    itm.ReportStatus = WY.NewJit.Extends.PaiGe.ReportStatusEnum.已作废;
-                }
-
-                await _menBanPackingListRepository.UpdateManyAsync(pairlist);
-                //批量改为未打印
-                var _childList = await _menBanPackingListRepository.Where(p => idList.Contains(p.Id)).SelectMany(p => p.Details).ToListAsync();
-                var _child = _childList.Select(p => p.M100BillId).Distinct().ToList();
-                var m100Lst = await _billM100Repository.Where(p => _child.Contains(p.Id)).ToListAsync();
-                m100Lst.ForEach(p =>
-                {
-                    if (p.BillStatus == BillStatusEnum.Publish)
-                    {
-                        p.SetBillStatus(BillStatusEnum.Match);
-                    }
-                    p.PrintTime = null;
-                });
-                await _billM100Repository.UpdateManyAsync(m100Lst);
-
-            }
-            else
-            {
-                throw new BusinessException("1001", "WMS已经排序，不能报废！");
-            }
-            return wmsLst.Select(p => p.BillNum).ToList();
-        }
+        //[HttpPost]
+        //[Route("scrap")]
+        //[UnitOfWork(isTransactional: false)]
+        //public virtual async Task<List<string>> ScrapAsync(List<Guid> ids)
+        //{
+        //    var selLst = await _menBanPackingListRepository.Where(p => ids.Contains(p.Id)).ToListAsync();
+        //    if (selLst == null || selLst.Count == 0)
+        //    {
+        //        throw new BusinessException("1001", "没有选中要作废的已打印装箱单！");
+        //    }
+        //    foreach (var _obj in selLst)
+        //    {
+        //        string maxBillNum = await _menBanPackingListRepository.Where(itm => itm.ProductLine == _obj.ProductLine && itm.ReportStatus == ReportStatusEnum.已打印).MaxAsync(itm => itm.BillNum); //取当前生产线的最大装箱单号
+        //        if (string.IsNullOrEmpty(maxBillNum) == false)
+        //        {
+        //            MenBanPackingList firObj = await _menBanPackingListRepository.FirstOrDefaultAsync(itm => itm.BillNum == maxBillNum);
+        //            if (firObj != null)
+        //            {
+        //                if (_obj.SortId != firObj.SortId)
+        //                {
+        //                    throw new BusinessException("1001", "只能报废当前生产线的最后打印单据，要报废的单据不是最后打印单据！");
+        //                }
+        //            }
+        //        }
+        //    }
+
+        //    var sortList = selLst.Select(p => p.SortId).Distinct().ToList();//筛选出匹配门板
+        //    List<MenBanPackingList> pairlist = _menBanPackingListRepository.Where(p => sortList.Contains(p.SortId)).ToList();
+
+
+        //    var idList = pairlist.Select(p => p.Id).ToList();
+        //    var _ls = pairlist.Select(p => p.BillNum).ToList();
+        //    var _strList = new List<string>();
+
+        //    _ls.ForEach(p => {
+        //        _strList.Add(string.Format("'{0}'", p));
+        //    });
+        //    string str = string.Join(",", _strList.ToArray());
+        //    var wmsLst = _wmsRepository.GetListBySql<TB_BILL>(string.Format("select top 100 * from TB_BILL with(nolock) where (state=1 or state=2) and BillNum in ({0}) ", str));
+        //    if (wmsLst.Count() == 0) //库存没有排序
+        //    {
+        //        //调用库存系统接口
+        //        List<string> billNumLst = pairlist.Select(itm => itm.BillNum).Distinct().ToList();
+        //        foreach (string billNumStr in billNumLst)
+        //        {
+        //            DelOrScrapWMSInterface(billNumStr, true);
+        //        }
+
+        //        #region 作废时单据序号减一
+        //        string curProductLine = selLst[0].ProductLine;
+        //        DateTime curPrintDate = selLst[0].PrintDate;
+        //        //string curPartType = selLst[0].PartType;
+        //        var priorLst = _menBanPackingListRepository.Where(itm => itm.ReportStatus == ReportStatusEnum.已打印 && itm.ProductLine == curProductLine && idList.Contains(itm.Id) == false);
+        //        if (priorLst.Any())
+        //        {
+        //            string maxBillNum = priorLst.Max(itm => itm.BillNum); //除去要作废记录，取当前生产线的最大单据号
+        //            MenBanPackingList priorObj = priorLst.FirstOrDefault(itm => itm.BillNum == maxBillNum); //除去要作废记录，取当前生产线的最后打印记录
+        //            double updRecCnt = await _lineSNDomianServic.SetMaxSN(ProductTypeEnum.门板, curProductLine, "", priorObj.PrintDate, priorObj.BillSerialNum.TryToDoubleZero(), null); //调用减号接口
+        //        }
+        //        else
+        //        {
+        //            double updRecCnt2 = await _lineSNDomianServic.SetMaxSN(ProductTypeEnum.门板, curProductLine, "", curPrintDate, 0, null); //调用减号接口，没有上条记录时 单据号传0
+        //        }
+        //        #endregion
+
+        //        foreach (var itm in pairlist)
+        //        {
+        //            itm.ReportStatus = WY.NewJit.Extends.PaiGe.ReportStatusEnum.已作废;
+        //        }
+
+        //        await _menBanPackingListRepository.UpdateManyAsync(pairlist);
+        //        //批量改为未打印
+        //        var _childList = await _menBanPackingListRepository.Where(p => idList.Contains(p.Id)).SelectMany(p => p.Details).ToListAsync();
+        //        var _child = _childList.Select(p => p.M100BillId).Distinct().ToList();
+        //        var m100Lst = await _billM100Repository.Where(p => _child.Contains(p.Id)).ToListAsync();
+        //        m100Lst.ForEach(p =>
+        //        {
+        //            if (p.BillStatus == BillStatusEnum.Publish)
+        //            {
+        //                p.SetBillStatus(BillStatusEnum.Match);
+        //            }
+        //            p.PrintTime = null;
+        //        });
+        //        await _billM100Repository.UpdateManyAsync(m100Lst);
+
+        //    }
+        //    else
+        //    {
+        //        throw new BusinessException("1001", "WMS已经排序，不能报废！");
+        //    }
+        //    return wmsLst.Select(p => p.BillNum).ToList();
+        //}

        #region 格拉默
        [HttpGet]
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/MsgCheck/BillStatusEnum.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/MsgCheck/BillStatusEnum.cs
@ -17,15 +17,15 @@ namespace WY.NewJit.MsgCheck
        //NotMatch = 1,

        /// <summary>
-        /// 已匹配，未打印
+        /// 未发运
        /// </summary>
-        [Description("未打印")]
+        [Description("未发运")]
        Match = 2,

        /// <summary>
-        /// 已打印
+        /// 已发运
        /// </summary>
-        [Description("已打印")]
+        [Description("已发运")]
        Publish = 3,

        /// <summary>
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItem.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItem.cs
@ -72,6 +72,19 @@ namespace WY.NewJit.MsgBaseData
        /// </summary>
        public virtual string DicItemSort9 { get; set; }

+        /// <summary>
+        /// 分类9（零件大类对应 是否扫描 1 需要扫描  0 不需要扫描）
+        /// </summary>
+        public virtual string DicItemSort10 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string DicItemSort11 { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string DicItemSort12 { get; set; }


        protected DicItem()
--- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Entitys/BillM100.cs
+++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Entitys/BillM100.cs
@ -67,7 +67,7 @@ namespace WY.NewJit.MsgCheck
        public virtual DateTime? ReceiveTime { get; protected set; }

        /// <summary>
-        /// 单据状态（0 空；1 未匹配；2 已匹配未打印；3 已打印）
+        /// 单据状态（2 未发运；3 已发运），发运接口更新为3
        /// </summary>
        public virtual BillStatusEnum BillStatus { get; protected set; }

@ -82,7 +82,7 @@ namespace WY.NewJit.MsgCheck
        public virtual DateTime? PrintTime { get; set; }

        /// <summary>
-        /// 打印单号【派格版本：不为空时表示已打印柱护板】
+        /// 打印单号（已经打印时更新为单号）
        /// </summary>
        public virtual string PrintBillNum { get; set; }

--- a/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg
+++ b/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg
--- a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll
+++ b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll
--- a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb
+++ b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb
--- a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll
+++ b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll
--- a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb
+++ b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb
--- a/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
+++ b/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
@ -5,7 +5,7 @@
    <version>2.0.0</version>
    <authors>Win.Sfs.Shared</authors>
    <description>Package Description</description>
-    <repository type="git" commit="9f1698b0f932dfc3e8d926fe272b9e5c15605da4" />
+    <repository type="git" commit="a5a9bdc002c0bde27fed59155b4f42778c8a586e" />
    <dependencies>
      <group targetFramework="net5.0">
        <dependency id="Win.Utils" version="2.0.0" exclude="Build,Analyzers" />
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfo.cs
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfo.cs
@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Win.Sfs.Shared")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+55c68df95edc067cefe3d74120d28daebdd00649")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+a5a9bdc002c0bde27fed59155b4f42778c8a586e")]
 [assembly: System.Reflection.AssemblyProductAttribute("Win.Sfs.Shared")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Win.Sfs.Shared")]
 [assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfoInputs.cache
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfoInputs.cache
@ -1 +1 @@
-48b37d1c823a2c28ae1847b40d58f961e3a2bcf25479d6132ccf6601b7861fc4
+ce8bce8f0148848382678a78ba43b96b07f28bbbffd2234bcd66f38b2eecf85f
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll
--- a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll
+++ b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll
--- a/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg
+++ b/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg
--- a/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll
+++ b/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll
--- a/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb
+++ b/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb
--- a/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
+++ b/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
@ -5,7 +5,7 @@
    <version>2.0.0</version>
    <authors>Win.Utils</authors>
    <description>Package Description</description>
-    <repository type="git" commit="32f3c7c4f91a6e47f64ef11cb91719a67226370a" />
+    <repository type="git" commit="655f97fce0dd87165ead1e3cce91aba34298af56" />
    <dependencies>
      <group targetFramework="net5.0">
        <dependency id="NPOI" version="2.5.2" exclude="Build,Analyzers" />
--- a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs
+++ b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs
@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Win.Utils")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+55c68df95edc067cefe3d74120d28daebdd00649")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+655f97fce0dd87165ead1e3cce91aba34298af56")]
 [assembly: System.Reflection.AssemblyProductAttribute("Win.Utils")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Win.Utils")]
 [assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]
--- a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache
+++ b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache
@ -1 +1 @@
-319ab87b608dd5265bea28a1b45afd1f00fabe88367ebb4631ed6d98436c50fc
+d35c56c2a77531ab3e36b55a499477cd4f9db824953aa80b990cafe5b4adf800
--- a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll
+++ b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll
--- a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb
+++ b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb
--- a/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll
+++ b/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll
--- a/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll
+++ b/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll
			`@ -0,0 +1 @@`
			BASE64QBYAAHicvVdNj9tEGD6nUv+Eew2WPf6I01uzy24PTYWSVXtYRciNp7sjHDsaO3RLyZFD1UMPCKlSxQEhrogTSCDEn2EXOPEXmBnPjL9mHDcb0UPjfT9n3vd5P+bf3/54dffOwHgCcYbSxLhv+KZvAtMyhpR8kia5cZ9KDIzH4QoS/vWPb/78/WvGHhhz9AWh2ZZnWVZBeQrRxSXRcQXh6DLEGSQU23EJYcvsfoJRkkNcmC5IxzAPUXyKUSQczuAyxRHTZQRyHARjwj5nfw0KYnmyzxJsFCRmUSHxOUp2SKxDnC/TCNo95cAOuUw6ZD8L+v+WByaNN6tE3IYrtu7CDTfY8iJqduMW3UKgS0icnx1/UT34EYEGTMrcPOSJt83ReGyPCmt12SMYx+3siTiwOw8F9TjMQ57ursRKZRoRpXJHzqVyGS+liZ2gaBkC3Ya0qJGGMs1tduLpDOUxbCXFMn0r8FxQywoTVefkFKebNTf1PIwzOOzO1hm8yh/E6IIypiiKqF1W4DUJqoWS67e/6K7fw20tz73dXv/6zV/v393OswIkvf3fvP755vWbAzgHezj/+/uv/vnhp5tvv7uF/2y/qL+thLwC2HIOhJj0GTYJGAQ5bEWXg5doGcMpuXf86THK1kYJ97rkMxTHjzerTv4cYhR2Sq3pVCLVBjsk0mizzB+hRC/zDF6g5AnvOioBmERdbNHtlP4JDI5kJ+qSAFqJTO9aKDs7JTythOi3NMlsYJA5vk5x/hCGkSbPVQFRXdp5kuQ4VXSss5drauoEQ8h2CIlF7kMwKgX0CD5nrdEajZ2RV4I3XVOqY1doE7KIiHWloMzzlzHMiOHzYxy+oKa+pB9Emf3O6OHZ1yTN83S14FUgi68cjRs6RH1JnqUvOA1Imjh8fWWoXJ/IoCSCVyRcw5L0FEX5JY2gF4w8QZYHUCgDlbIVuKNxH223re2ZduAFTh9tr61tmcC2fX/UR91vq7sks64XSG3+sWiFlYS8jGmbXRuRNd+YKlYjvqTQrBKojUI/xxtYYTSBXLdcAnqehzlaTtIrY1jlclRLrl1n8wg4pms7tlNjqVcC4bRo3KezB9Ppx7OPjJK3lZ+LznSoQ1IFFvdxfu9Vq79v78k6+RDrziEDPoWrVBduzmsEu+gjtmmPLd9RpcE3XQuMgSYNztgPRl6NWXl2NY9QfX5JHn+GucDjry7JmaR0bayHYtB+lYl/WxUaSKb4fK3mpwaJWpzj+TokTQrskUlPm8k9jPmHhMUkxHT/UsKC84AKFqKHqXABTG+sx0VRnntWIGgGQ9+U9jCmL7g9jLmHNHYbALWMHRRAPfqKBkCKBtELQAq9/hXdmprFb2OLry54J2mqW+SrAq0FzzGBZbv+oRY8V7HgAZ/sARK0/9uGd8tVTrGNAdN1XLvXQuS0tV3SU5x+m6BilyOLuOuDXtqKXc4xvZEdfOgytiMq5RuhtuFqbe/Y5Lr7XHMm6yeymMeBZdXmsXoaq2dxZRI3qla+Y/ttS50tsrQs3741q93Ff/fO9j/5TWYU