´úÂë¹ÜÀí/WIDESEAWCS_Client/src/views/basicinfo/boxing.vue

@@ -68,7 +68,13 @@
          require: true,
        },
      ],
      [
      [{
          title: "供方代码",
          field: "supplierCode",
          type: "input",
          width: 200,
          require: true,
        },
        {
          title: "主键ID",
          field: "id",
@@ -88,6 +94,7 @@
      boxingNo: "", // æµæ°´å·æŸ¥è¯¢å­—段
      creater: "",
      createDate: "",
      supplierCode: "",
    });

    const searchFormOptions = ref([
@@ -99,6 +106,7 @@
        { title: "流水号", field: "boxingNo", type: "like" },
      ],
      [
        { title: "供方代码", field: "supplierCode", type: "like" },
        { title: "创建人", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
@@ -138,6 +146,13 @@
        width: 200,
        align: "left",
      },
      {
        field: "supplierCode",
        title: "供方代码",
        type: "string",
        width: 200,
        align: "left",
      },
      // æ–°å¢žï¼šæµæ°´å·è¡¨æ ¼åˆ—（宽度和其他编号保持200，可根据需求调整）
      {
        field: "boxingNo",

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a92150fa-07f2-4b35-842d-8af5d93da741.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/BoxingDetailService.cs

@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.PLCEnum;
@@ -25,7 +26,7 @@
        private readonly IFormulaDetailService _formulaDetailService;
        private readonly IProcessInfoDetailService _processInfoDetailService;
        private readonly IScanStationService _scanStationService;
        


        private readonly IUnitOfWorkManage _unitOfWorkManage;

@@ -45,7 +46,7 @@
            _processInfoDetailService = processInfoDetailService;
            _scanStationService = scanStationService;
            _unitOfWorkManage = unitOfWorkManage;
            

        }

        public IRepository<Dt_BoxingDetail> Repository => BaseDal;
@@ -152,26 +153,39 @@
                    {
                        return WebResponseContent.Instance.Error("提交参数不能为空");
                    }
                    string productCode = toolingBoardSubmitDto.FinishedProductCode?.Trim();
                    string productCode = toolingBoardSubmitDto.FinishedProductCode.Trim();

                    string proCode = string.Empty;
                    string proOther = string.Empty;
                    string supplierCode = string.Empty;

                    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 = System.Text.RegularExpressions.Regex.Match(productCode, @"TX(\d+)(?=\s|\||$)", System.Text.RegularExpressions.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 = System.Text.RegularExpressions.Regex.Match(productCode, @"\d{10}");
                        if (proOtherMatch.Success)
                        {
                            proOther = proOtherMatch.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);
@@ -181,7 +195,7 @@
                        }

                        Dt_ScanStation dt_ScanStation = _scanStationService.Repository.QueryFirst(x => x.StationCode == "001");
                        if (dt_ScanStation.StationEndProduct != proCode) 
                        if (dt_ScanStation.StationEndProduct != proCode)
                        {
                            return WebResponseContent.Instance.Error("成品编号错误");
                        }
@@ -194,10 +208,10 @@
                            return WebResponseContent.Instance.Error($"物料【{IsCode}】错误，请核对物料编号");
                        }

                        
                        


                        //Dt_Boxing existBoxinModel = _boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
                        

                        //if (existBoxinModel == null)
                        //{
                        //    return WebResponseContent.Instance.Error($"托盘未添加，请稍后重试");
@@ -214,14 +228,16 @@
                            throw new InvalidOperationException("托盘码未扫到，请重试");
                        }
                        Dt_Boxing dt_Boxing = _boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
                        if(dt_Boxing != null)
                        if (dt_Boxing != null)
                        {
                            throw new InvalidOperationException("托盘码重复扫描");
                        }
                        Dt_Boxing existBoxinModel = new Dt_Boxing();
                        existBoxinModel.PalletCode = PalletCode;
                        existBoxinModel.ProductCode = proCode;
                        existBoxinModel.ProductName = formulaModel.ProductName;
                        existBoxinModel.BoxingNo = proOther;
                        existBoxinModel.SupplierCode = supplierCode;

                        int id = _boxingService.Repository.AddData(existBoxinModel);

@@ -240,7 +256,7 @@
                        uow.Commit();
                    }

                    


                    OtherDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceName == "主控PLC") as OtherDevice;
                    if (device == null) throw new Exception("未找到主控PLC设备信息");
@@ -355,7 +371,7 @@
                            .QueryData(x => x.ProductSn == proOther && x.ProductCode == proCode).ToList();

                    // 3. åˆ¤æ–­æŸ¥è¯¢ç»“果，存在则赋值提示信息
                    if (dt_ProcessInfoDetail.Count<=3 && dt_ProcessInfoDetail.Count != 0)
                    if (dt_ProcessInfoDetail.Count <= 3 && dt_ProcessInfoDetail.Count != 0)
                    {
                        msg = "已有流水号";
                    }

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Boxing.cs

@@ -41,6 +41,12 @@
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "流水号")]
        public string BoxingNo { get; set; }

        /// <summary>
        /// ä¾›æ–¹ä»£ç 
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "供方代码")]
        public string SupplierCode { get; set; }

        [SugarColumn(IsIgnore = true)]//不参与数据库映射，测试使用
        [Navigate(NavigateType.OneToMany, nameof(Dt_BoxingDetail.BoxingId), nameof(Id))]
        public List<Dt_BoxingDetail> Details { get; set; }

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj

@@ -68,7 +68,6 @@
    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\WIDESEAWCS_IProductRecordServer\WIDESEAWCS_IProductRecordService.csproj" />
        <ProjectReference Include="..\WIDESEAWCS_SystemServices\WIDESEAWCS_SystemServices.csproj" />
        <ProjectReference Include="..\WIDESEAWCs_TaskInfoService\WIDESEAWCs_TaskInfoService.csproj" />
        <ProjectReference Include="..\WIDESEAWCS_Tasks\WIDESEAWCS_Tasks.csproj" />

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -17,7 +17,7 @@
  //5.PostgreSQL
  "DBType": "SqlServer",
  //连接字符串
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_FDJ;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_FDJ;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称
@@ -32,9 +32,9 @@
  "QuartzJobAutoStart": true,
  "DBSeedEnable": false,
  "QuartzDBSeedEnable": false,
  "LogDeubgEnable": true, //是否记录调试日志
  "LogDeubgEnable": false, //是否记录调试日志
  "PrintSql": false, //打印SQL语句
  "LogAOPEnable": true, //是否记录AOP日志
  "LogAOPEnable": false, //是否记录AOP日志
  "WebSocketEnable": true, //是否开启WebSocket服务
  "WebSocketPort": 9296 //WebSocket服务端口
}

 ´úÂë¹ÜÀí/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+8aa5f0e094e6ff51aa7c47d5b4e8331a16eb09ff")]
[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 @@
c97e13df12cbbd7b4f052106b0c5e3e54606d4e7d7c3571cbd36adfdc2f442d8
809539e918c0b7200ed3ceea689801d3a0fc42f6df33f9133fa5d11ccbf70930

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,8 +8,6 @@
build_property.EnforceExtendedAnalyzerRules = 
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WIDESEAWCS_TaskInfoService
build_property.ProjectDir = E:\gsxm\FaDianJi\代码管理\WIDESEAWCS_Server\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\
build_property.ProjectDir = E:\项目集\FaDianJi\代码管理\WIDESEAWCS_Server\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\
build_property.EnableComHosting = 
build_property.EnableGeneratedComInterfaceComImportInterop = 
build_property.EffectiveAnalysisLevelStyle = 6.0
build_property.EnableCodeStyleSeverity = 

 ´úÂë¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCs_TaskInfoService.assets.cache

Binary files differ

 ÏîÄ¿×ÊÁÏ/dbo.sql

Binary files differ