dengjunjie
3 天以前 b52018589bf6c7ec1d51ce8ad000a7aa993b0ab5
优化组盘表获取成品编号、流水号、供方代码
已添加1个文件
已修改4个文件
44 ■■■■■ 文件已修改
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/BoxingDetailService.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/dbo.sql 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo
Binary files differ
´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/BoxingDetailService.cs
@@ -161,24 +161,31 @@
                    if (!string.IsNullOrWhiteSpace(productCode))
                    {
                        string[] parts = productCode.Split(new char[] { ' ', '|' }, StringSplitOptions.RemoveEmptyEntries);
                        if (parts.Length < 3) return WebResponseContent.Instance.Error("编码规则有误!");
                        proCode = parts[0];
                        proOther = parts[1];
                        supplierCode = parts[2];
                        var proCodeMatch = Regex.Match(productCode, @"TX(\d+)(?=\s|\||$)", RegexOptions.IgnoreCase);
                        if (proCodeMatch.Success)
                        {
                            proCode = $"TX{proCodeMatch.Groups[1].Value.Trim()}";
                        }
                        #region èŽ·å–æˆå“ç¼–å·ã€æµæ°´å·ã€ä¾›æ–¹ä»£ç 
                        //var proCodeMatch = Regex.Match(productCode, @"TX(\d+)(?=\s|\||$)", RegexOptions.IgnoreCase);
                        //if (proCodeMatch.Success)
                        //{
                        //    proCode = $"TX{proCodeMatch.Groups[1].Value.Trim()}";
                        //}
                        // æ­£åˆ™2:匹配连续的10位纯数字(全局匹配,取第一个符合的即可)
                        var proOtherMatch = Regex.Match(productCode, @"\d{10}");
                        if (proOtherMatch.Success)
                        {
                            proOther = proOtherMatch.Value.Trim();
                        }
                        var supplierCodeMatch = Regex.Match(productCode, @"[A-Z]+$", RegexOptions.IgnoreCase);
                        if (supplierCodeMatch.Success)
                        {
                            supplierCode = supplierCodeMatch.Value.Trim();
                        }
                        //// æ­£åˆ™2:匹配连续的10位纯数字(全局匹配,取第一个符合的即可)
                        //var proOtherMatch = Regex.Match(productCode, @"\d{10}");
                        //if (proOtherMatch.Success)
                        //{
                        //    proOther = proOtherMatch.Value.Trim();
                        //}
                        //var supplierCodeMatch = Regex.Match(productCode, @"[A-Z]+$", RegexOptions.IgnoreCase);
                        //if (supplierCodeMatch.Success)
                        //{
                        //    supplierCode = supplierCodeMatch.Value.Trim();
                        //}
                        #endregion
                        toolingBoardSubmitDto.PartsList = toolingBoardSubmitDto.PartsList.Where(code => !string.IsNullOrEmpty(code)).ToList();
                        // 2. æŸ¥è¯¢æˆå“é…æ–¹ä¿¡æ¯
                        Dt_Formula formulaModel = _formulaService.Repository.QueryFirst(x => x.ProductCode == proCode);
@@ -228,6 +235,7 @@
                        Dt_Boxing existBoxinModel = new Dt_Boxing();
                        existBoxinModel.PalletCode = PalletCode;
                        existBoxinModel.ProductCode = proCode;
                        existBoxinModel.ProductName = formulaModel.ProductName;
                        existBoxinModel.BoxingNo = proOther;
                        existBoxinModel.SupplierCode = supplierCode;
´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+891207469b41c23d22805876a4e179d75832572f")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b784d019c3848718eb95eb0d34dde34c6a262b06")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache
@@ -1 +1 @@
6e5d0f7bae4a31644ed3011f2065b7b7f697034e95b5b9af19f796b67aef9540
809539e918c0b7200ed3ceea689801d3a0fc42f6df33f9133fa5d11ccbf70930
ÏîÄ¿×ÊÁÏ/dbo.sql
Binary files differ