diff --git a/.gitignore b/.gitignore index 5b7c739..e78c733 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ /*.rar +packages +.vs +bin +obj +~bak diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Handlers/Handler1.ashx.cs b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Handlers/Handler1.ashx.cs index 68ca69d..67fe3d9 100644 --- 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); diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Web.config b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Web.config index 32897a7..2c86dca 100644 --- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Web.config +++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/Web.config @@ -14,4 +14,16 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/WebApplicationGridJJReport.csproj.user b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/WebApplicationGridJJReport.csproj.user index 8325ddd..2adebda 100644 --- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/WebApplicationGridJJReport.csproj.user +++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/WebApplicationGridJJReport.csproj.user @@ -1,4 +1,4 @@ - + true @@ -15,7 +15,7 @@ - /Handlers/Handler1.ashx?report=zhuhuban&returnfile=1 + /Handlers/Handler1.ashx?report=menban&returnfile=1 SpecificPage True False diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/appcode/PostParam.cs b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/appcode/PostParam.cs index 94cc6f6..6ef9dc1 100644 --- a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/appcode/PostParam.cs +++ b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/appcode/PostParam.cs @@ -10,7 +10,7 @@ namespace WebApplicationGridJJReport.appcode // public const string ZhuHuBanVal = @" //{'masterList_AC':[{'billNum':' 10000000127','billSerialNum':'06','billLocation':null,'providerCode':'0709FAW-VW7XH','partType':'A上C上','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null}],'detailList_AC':[{'billNum':' 10000000127','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867233CYM5','partCode2':'','sn':1},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000127','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24}],'masterList_AA':[{'billNum':' 10000000128','billSerialNum':'06','billLocation':'左','providerCode':'0709FAW-VW7XH','partType':'A柱下A中','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null},{'billNum':' 10000000129','billSerialNum':'06','billLocation':'右','providerCode':'0709FAW-VW7XH','partType':'A柱下A中','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null}],'detailList_AA':[{'billNum':' 10000000128','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867271DS2','partCode2':'80D868203DS2','sn':1},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000128','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24},{'billNum':' 10000000129','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867272ADS2','partCode2':'80D868204DS2','sn':1},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000129','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24}],'masterList_BS':[{'billNum':' 10000000130','billSerialNum':'06','billLocation':'左','providerCode':'0709FAW-VW7XH','partType':'B柱上','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null},{'billNum':' 10000000131','billSerialNum':'06','billLocation':'右','providerCode':'0709FAW-VW7XH','partType':'B柱上','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null}],'detailList_BS':[{'billNum':' 10000000130','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'','partCode2':null,'sn':1},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000130','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24},{'billNum':' 10000000131','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867244AYW5','partCode2':null,'sn':1},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000131','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24}],'masterList_BX':[{'billNum':' 10000000132','billSerialNum':'06','billLocation':'左','providerCode':'0709FAW-VW7XH','partType':'B柱下','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null},{'billNum':' 10000000133','billSerialNum':'06','billLocation':'右','providerCode':'0709FAW-VW7XH','partType':'B柱下','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null}],'detailList_BX':[{'billNum':' 10000000132','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D8672394PK','partCode2':null,'sn':1},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000132','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24},{'billNum':' 10000000133','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867240DS2','partCode2':null,'sn':1},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000133','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24}],'masterList_D':[{'billNum':' 10000000134','billSerialNum':'11','billLocation':null,'providerCode':'0709FAW-VW7XH','partType':'D柱','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null},{'billNum':' 10000000135','billSerialNum':'12','billLocation':null,'providerCode':'0709FAW-VW7XH','partType':'D柱','capacity':'0','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':null,'endVin':null,'details':null}],'detailList_D':[{'billNum':' 10000000134','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867245ACE3','partCode2':null,'sn':1},{'billNum':' 10000000134','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80G8672464PK','partCode2':null,'sn':2},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000134','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':1},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000135','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24}],'masterList_HL':[{'billNum':' 10000000136','billSerialNum':'06','billLocation':'左','providerCode':'0709FAW-VW7XH','partType':'后轮上装饰板','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null},{'billNum':' 10000000137','billSerialNum':'06','billLocation':'右','providerCode':'0709FAW-VW7XH','partType':'后轮上装饰板','capacity':'1','printDate':'2021-12-01 15:53:54','printType':0,'productLine':'08','beginVin':'LFV3A24K0M3117267','endVin':'LFV3A24K0M3117267','details':null}],'detailList_HL':[{'billNum':' 10000000136','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867767DS2','partCode2':'','sn':1},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000136','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24},{'billNum':' 10000000137','knr':' 21325574111001','vin':'LFV3A24K0M3117267','hostSN':383,'partCode':'80D867768DS2','partCode2':'','sn':1},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':2},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':3},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':4},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':5},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':6},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':7},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':8},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':9},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':10},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':11},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':12},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':13},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':14},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':15},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':16},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':17},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':18},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':19},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':20},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':21},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':22},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':23},{'billNum':' 10000000137','knr':' ','vin':null,'hostSN':null,'partCode':null,'partCode2':null,'sn':24}]} //"; - + /* public const string ZhuHuBanVal = @" { 'item': { @@ -2606,7 +2606,8 @@ namespace WebApplicationGridJJReport.appcode 'message': '' } "; - + */ + /* public const string MenBanVal = @" { 'masterList': [ @@ -2954,6 +2955,216 @@ namespace WebApplicationGridJJReport.appcode } ] } +"; + */ + + public const string MenBanVal = @" + { + 'id': '1f9e60c5-6754-6c9b-fce3-3a1b902dd6d7', + 'billNum': '20250806001703', + 'billSerialNum': '001', + 'vehicleModel': 'Q5', + 'vehicleModel_Disp': 'Q5NF', + 'providerCode': null, + 'partType': '703', + 'capacity': null, + 'printDate': '2025-08-06 14:15:17', + 'printType': 0, + 'productLine': '02', + 'beginVin': 'LFV3B2FY5S3474908', + 'endVin': 'LFV3B2FYXS3474919', + 'beginVin1': null, + 'endVin1': null, + + 'reportStatus': 2, + 'beginHostSN': '80005', + 'endHostSN': '80016' + + + 'details': [ + { + 'm100BillId': '23d30ecf-f4c9-d048-f2d3-3a1b4311313d', + 'billNum': '20250806001703', + 'knr': '2526191911', + 'vin': '474908', + 'hostSN': '80005', + 'partCode1': '80D885703AHVE4', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '1', + 'scanPartCode': '1571151', + 'remark': null + }, + { + 'm100BillId': '5f755549-cbb1-7cf2-fe4f-3a1b43113d39', + 'billNum': '20250806001703', + 'knr': '2525195118', + 'vin': '474909', + 'hostSN': '80006', + 'partCode1': '80D885703AHVE4', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '2', + 'scanPartCode': '1571151', + 'remark': null + }, + { + 'm100BillId': 'ebced6f7-b982-5b76-91ec-3a1b43114197', + 'billNum': '20250806001703', + 'knr': '2526192154', + 'vin': '474910', + 'hostSN': '80007', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '3', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '87999866-d64c-da6a-ad7e-3a1b4311513f', + 'billNum': '20250806001703', + 'knr': '2525290639', + 'vin': '474911', + 'hostSN': '80008', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '4', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '3f14f9ea-257b-c554-a3e8-3a1b4311544f', + 'billNum': '20250806001703', + 'knr': '2526191966', + 'vin': '474912', + 'hostSN': '80009', + 'partCode1': '80D885703AHVE4', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '5', + 'scanPartCode': '1571151', + 'remark': null + }, + { + 'm100BillId': '9250eecd-7772-aa05-edd7-3a1b4311653d', + 'billNum': '20250806001703', + 'knr': '2525290738', + 'vin': '474913', + 'hostSN': '80010', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '6', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '2cc334c9-2244-b4b9-7173-3a1b43116f36', + 'billNum': '20250806001703', + 'knr': '2526192079', + 'vin': '474914', + 'hostSN': '80011', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '7', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '7a24ff24-a032-d83d-be1b-3a1b43117715', + 'billNum': '20250806001703', + 'knr': '2525291025', + 'vin': '474915', + 'hostSN': '80012', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '8', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '323d4050-e018-7a34-a87d-3a1b43118134', + 'billNum': '20250806001703', + 'knr': '2525290837', + 'vin': '474916', + 'hostSN': '80013', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '9', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '4f5acff7-e891-f249-2045-3a1b43118c1e', + 'billNum': '20250806001703', + 'knr': '2526192437', + 'vin': '474917', + 'hostSN': '80014', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '10', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '45156e53-5fd7-30dc-d1af-3a1b43118e00', + 'billNum': '20250806001703', + 'knr': '2526192048', + 'vin': '474918', + 'hostSN': '80015', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '11', + 'scanPartCode': '1571149', + 'remark': null + }, + { + 'm100BillId': '41cc40a8-6dae-e638-5b4e-3a1b431195ee', + 'billNum': '20250806001703', + 'knr': '2525290868', + 'vin': '474919', + 'hostSN': '80016', + 'partCode1': '80D885703AH6PS', + 'partCode2': null, + 'partCode3': null, + 'partCode4': null, + 'partCode5': null, + 'sn': '12', + 'scanPartCode': '1571149', + 'remark': null + } + ], + + } "; } } \ No newline at end of file diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-头枕.grf b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-头枕.grf new file mode 100644 index 0000000..05d4e4b --- /dev/null +++ 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}#]" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-扶手.grf b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/C8-扶手.grf new file mode 100644 index 0000000..60e02a2 --- /dev/null +++ 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 \ No newline at end of file diff --git a/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/Q5NF.grf b/Modules/WebApplicationGridJJReport/WebApplicationGridJJReport/grf/Q5NF.grf new file mode 100644 index 0000000..9b27cc9 --- /dev/null +++ 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}#]" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git 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 index 8dc0da3..9db318d 100644 --- 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 /// public string EndHostSN { set; get; } - + /// + /// 排序字段 + /// + public int SN { get; set; } public MenBanPackingListDto() { @@ -159,6 +162,23 @@ namespace WY.NewJit.Extends } + public class MenBanPackingListResultDto + { + public List MainList1 { get; set; } + + public List MainList2 { get; set; } + public List DetailList1 { get; set; } + + public List DetailList2 { get; set; } + + public MenBanPackingListResultDto() + { + MainList1 = new List(); + MainList2 = new List(); + DetailList1 = new List(); + DetailList2 = new List(); + } + } } diff --git 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 index f8a01c9..cdb62f3 100644 --- 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 /// public virtual string DicItemSort9 { get; set; } + /// + /// 分类10（零件大类对应 是否扫描 1 需要扫描 0 不需要扫描） + /// + public virtual string DicItemSort10 { get; set; } + + /// + /// + /// + public virtual string DicItemSort11 { get; set; } + /// + /// + /// + public virtual string DicItemSort12 { get; set; } + } } diff --git 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 index c1281a7..9073733 100644 --- 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 @@ 顺序号结束 + + + 排序字段 + + 生产线 @@ -1000,6 +1005,21 @@ 分类9（零件大类对应 打印标准数量 12 或 24） + + + 分类10（零件大类对应 是否扫描 1 需要扫描 0 不需要扫描） + + + + + + + + + + + + diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs index 881ba53..1545883 100644 --- 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 LoadMenBanReport2(List input) + { + _logger.LogDebug(_errorMessagePrefix + "LoadMenBanReport2 进入"); + MenBanPackingListResultDto ret = new MenBanPackingListResultDto(); + try + { + List reportLst = await LoadMenBanReport(input); + + List 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(); ; diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/MenBanPackingRecService.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/MenBanPackingRecService.cs index 489d626..832bfed 100644 --- 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 /// /// IDs /// 是否执行成功 - [HttpPost] - [Route("delete")] - [UnitOfWork(isTransactional: false)] - public virtual async Task> DeleteListAsync(List 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 (); + //[HttpPost] + //[Route("delete")] + //[UnitOfWork(isTransactional: false)] + //public virtual async Task> DeleteListAsync(List 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 (); - _ls.ForEach(p=>{ - _strList.Add(string.Format("'{0}'", p)); - }); - string str=string.Join(",", _strList.ToArray()); - var _lst=_wmsRepository.GetListBySql(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); + // _ls.ForEach(p=>{ + // _strList.Add(string.Format("'{0}'", p)); + // }); + // string str=string.Join(",", _strList.ToArray()); + // var _lst=_wmsRepository.GetListBySql(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(); - } + // } + // return _lst.Select(p => p.BillNum).ToList(); + //} /// /// 取待报废的全部数据，用于展示 @@ -286,98 +286,98 @@ namespace Win.Sfs.SettleAccount.FISes /// /// IDs /// 是否执行成功 - [HttpPost] - [Route("scrap")] - [UnitOfWork(isTransactional: false)] - public virtual async Task> ScrapAsync(List 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 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(); - - _ls.ForEach(p => { - _strList.Add(string.Format("'{0}'", p)); - }); - string str = string.Join(",", _strList.ToArray()); - var wmsLst = _wmsRepository.GetListBySql(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 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> ScrapAsync(List 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 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(); + + // _ls.ForEach(p => { + // _strList.Add(string.Format("'{0}'", p)); + // }); + // string str = string.Join(",", _strList.ToArray()); + // var wmsLst = _wmsRepository.GetListBySql(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 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] diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/MsgCheck/BillStatusEnum.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/MsgCheck/BillStatusEnum.cs index 2660c33..67188fb 100644 --- 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, /// - /// 已匹配，未打印 + /// 未发运 /// - [Description("未打印")] + [Description("未发运")] Match = 2, /// - /// 已打印 + /// 已发运 /// - [Description("已打印")] + [Description("已发运")] Publish = 3, /// diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItem.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItem.cs index 74623e1..a4b39b1 100644 --- 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 /// public virtual string DicItemSort9 { get; set; } + /// + /// 分类9（零件大类对应 是否扫描 1 需要扫描 0 不需要扫描） + /// + public virtual string DicItemSort10 { get; set; } + + /// + /// + /// + public virtual string DicItemSort11 { get; set; } + /// + /// + /// + public virtual string DicItemSort12 { get; set; } protected DicItem() diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Entitys/BillM100.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Entitys/BillM100.cs index d73462d..9d84b04 100644 --- 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; } /// - /// 单据状态（0 空；1 未匹配；2 已匹配未打印；3 已打印） + /// 单据状态（2 未发运；3 已发运），发运接口更新为3 /// public virtual BillStatusEnum BillStatus { get; protected set; } @@ -82,7 +82,7 @@ namespace WY.NewJit.MsgCheck public virtual DateTime? PrintTime { get; set; } /// - /// 打印单号【派格版本：不为空时表示已打印柱护板】 + /// 打印单号（已经打印时更新为单号） /// public virtual string PrintBillNum { get; set; } diff --git 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 index 60cefce..f3be9fb 100644 Binary files a/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg and b/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg differ diff --git a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll index f34ed9b..f88760c 100644 Binary files a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll and b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll differ diff --git a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb index af937c0..472c778 100644 Binary files a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb and b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb differ diff --git a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll index 769153a..04339d6 100644 Binary files a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll and b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll differ diff --git a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb index 603b194..b067310 100644 Binary files a/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb and b/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb differ diff --git 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 index 7a8575a..a4187c7 100644 --- 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 @@ 2.0.0 Win.Sfs.Shared Package Description - + diff --git 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 index 4bf6f0b..6d53d66 100644 --- 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")] diff --git 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 index 6bbb8b8..7f783e5 100644 --- 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 diff --git 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 index eea8334..0ad3b9a 100644 Binary files a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ diff --git a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll index f34ed9b..f88760c 100644 Binary files a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll and b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll differ diff --git a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb index af937c0..472c778 100644 Binary files a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb and b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb differ diff --git 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 index 3762e96..4be7eda 100644 Binary files a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll and b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll differ diff --git 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 index 3762e96..4be7eda 100644 Binary files a/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll and b/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll differ diff --git a/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg b/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg index 1d78a1f..d8c5b7d 100644 Binary files a/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg and b/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg differ diff --git a/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll b/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll index 769153a..04339d6 100644 Binary files a/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll and b/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll differ diff --git a/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb b/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb index 603b194..b067310 100644 Binary files a/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb and b/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb differ diff --git a/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec b/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec index 5ad4f77..7a63211 100644 --- 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 @@ 2.0.0 Win.Utils Package Description - + diff --git a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs index 69ddc12..508caa2 100644 --- 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")] diff --git a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache index be5fb63..ca30889 100644 --- 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 diff --git a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll index 769153a..04339d6 100644 Binary files a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll and b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll differ diff --git a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb index 603b194..b067310 100644 Binary files a/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb and b/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb differ diff --git a/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll b/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll index 172dccf..52cfa20 100644 Binary files a/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll and b/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll differ diff --git a/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll b/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll index 172dccf..52cfa20 100644 Binary files a/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll and b/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll differ