zyf
2025-11-11 eca13a5ffc805ea1252a75dfeae46afd1cdbe701
巡检入库检bug修复,物料检验周期字段增加
已修改25个文件
43 ■■■■■ 文件已修改
MES.Service/Dto/webApi/ErpItems.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesItems.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/QsItemIpiItem.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesItemsManager.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QC/RKJService.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpItems.cs
@@ -46,4 +46,6 @@
    public string? F_WWC_TEXT4 { get; set; }
    public string? F_WWC_TEXT5 { get; set; }
    public string? F_WWC_TEXT6 { get; set; }
    public string? F_WWC_FJZQ { get; set; }
}
MES.Service/Modes/MesItems.cs
@@ -416,5 +416,11 @@
    [SugarColumn(ColumnName = "F_WWC_TEXT6")]
    public string? F_WWC_TEXT6 { get; set; }
    /// <summary>
    ///     注塑件吨位
    /// </summary>
    [SugarColumn(ColumnName = "RE_CYCLE")]
    public string? F_WWC_FJZQ { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
MES.Service/Modes/QsItemIpiItem.cs
@@ -25,7 +25,7 @@
    /// </summary>
    [Column("FAC_LEVEL")]
    [SugarColumn(ColumnName = "FAC_LEVEL")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "接收水平长度不能超出100")]
    //[StringLength(100, ErrorMessage = "接收水平长度不能超出100")]
    public string? FacLevel { get; set; }
    /// <summary>
@@ -33,7 +33,7 @@
    /// </summary>
    [Column("FCHECK_LEVEL")]
    [SugarColumn(ColumnName = "FCHECK_LEVEL")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验水平长度不能超出100")]
    //[StringLength(100, ErrorMessage = "检验水平长度不能超出100")]
    public string? FcheckLevel { get; set; }
    /// <summary>
@@ -41,7 +41,7 @@
    /// </summary>
    [Column("INSPECTION_METHOD")]
    [SugarColumn(ColumnName = "INSPECTION_METHOD")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "检验方法长度不能超出50")]
    //[StringLength(50, ErrorMessage = "检验方法长度不能超出50")]
    public string? InspectionMethod { get; set; }
    /// <summary>
@@ -49,7 +49,7 @@
    /// </summary>
    [Column("ITEM_MOD")]
    [SugarColumn(ColumnName = "ITEM_MOD")] //用于SqlSugar
    [StringLength(500, ErrorMessage = "质量要求长度不能超出500")]
    //[StringLength(500, ErrorMessage = "质量要求长度不能超出500")]
    public string? ItemMod { get; set; }
    /// <summary>
@@ -78,7 +78,7 @@
    /// </summary>
    [Column("NOTES")]
    [SugarColumn(ColumnName = "NOTES")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "备注长度不能超出100")]
    //[StringLength(100, ErrorMessage = "备注长度不能超出100")]
    public string? Notes { get; set; }
    /// <summary>
@@ -93,7 +93,7 @@
    /// </summary>
    [Column("PROJ_NAME")]
    [SugarColumn(ColumnName = "PROJ_NAME")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "项目名称长度不能超出50")]
    //[StringLength(50, ErrorMessage = "项目名称长度不能超出50")]
    public string? ProjName { get; set; }
    /// <summary>
@@ -101,7 +101,7 @@
    /// </summary>
    [Column("QS_CODE")]
    [SugarColumn(ColumnName = "QS_CODE")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验标准编码长度不能超出100")]
    //[StringLength(100, ErrorMessage = "检验标准编码长度不能超出100")]
    public string? QsCode { get; set; }
    /// <summary>
@@ -109,7 +109,7 @@
    /// </summary>
    [Column("QS_NAME")]
    [SugarColumn(ColumnName = "QS_NAME")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验标准名称长度不能超出100")]
    //[StringLength(100, ErrorMessage = "检验标准名称长度不能超出100")]
    public string? QsName { get; set; }
    /// <summary>
@@ -124,7 +124,7 @@
    /// </summary>
    [Column("USING_INSTRUMENTS")]
    [SugarColumn(ColumnName = "USING_INSTRUMENTS")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "使用仪表长度不能超出50")]
    //[StringLength(50, ErrorMessage = "使用仪表长度不能超出50")]
    public string? UsingInstruments { get; set; }
    /// <summary>
@@ -153,12 +153,12 @@
    /// </summary>
    [Column("PICTURENAME")]
    [SugarColumn(ColumnName = "PICTURENAME")] //用于SqlSugar
    [StringLength(32, ErrorMessage = "Picturename长度不能超出32")]
    //[StringLength(32, ErrorMessage = "Picturename长度不能超出32")]
    public string? Picturename { get; set; }
    [Column("REMARKS")]
    [SugarColumn(ColumnName = "REMARKS")] //用于SqlSugar
    [StringLength(200, ErrorMessage = "备注不能超出200")]
    //[StringLength(200, ErrorMessage = "备注不能超出200")]
    public string? Remarks { get; set; }
    /// <summary>
MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MES.Service/service/BasicData/MesItemsManager.cs
@@ -179,7 +179,8 @@
            F_WWC_TEXT6 = item.F_WWC_TEXT6,
            CreateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            F_WWC_FJZQ= item.F_WWC_FJZQ
        };
    }
MES.Service/service/QC/RKJService.cs
@@ -3,6 +3,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
using SqlSugar.Extensions;
namespace MES.Service.service.QC;
@@ -84,9 +85,14 @@
        if (count <= 0)
            return [];
        decimal? ID = db.Queryable<MesQa>()
            .Where(s => s.QsType == "3" && s.ItemNo == itemNo && s.Fsubmit == 1)
            .Select(s=> s.Id)
            .First();
        // 获取质量标准
        var qsItemOqcItems = db.Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "3" && b.ItemNo == itemNo)
            .Where(b => b.QsType == "3" && b.Pid == ID)
            .Select(b => new QsItemOqcItem
            {
                ProjName = b.ProjName,
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>E:\MES\YC\JK\YC\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-10-30T05:21:26.9927646Z||;True|2025-10-24T19:18:08.4129813+08:00||;True|2025-09-29T17:17:51.1103513+08:00||;True|2025-08-29T14:18:40.5594388+08:00||;True|2025-08-28T18:15:38.3971489+08:00||;True|2025-08-28T18:15:06.7333272+08:00||;True|2025-08-27T18:35:09.5980695+08:00||;True|2025-08-26T19:16:55.3617645+08:00||;True|2025-08-21T10:27:13.8176169+08:00||;True|2025-06-26T08:55:26.5542141+08:00||;True|2025-06-25T09:11:45.3214896+08:00||;True|2025-05-23T13:03:55.7681923+08:00||;True|2025-05-23T12:30:20.3979750+08:00||;True|2025-05-06T18:44:59.6980994+08:00||;True|2025-05-06T18:39:53.5994195+08:00||;True|2025-05-06T15:31:35.4635552+08:00||;True|2025-05-06T14:42:04.8934173+08:00||;True|2025-04-28T20:38:10.9382378+08:00||;True|2025-04-28T19:02:47.1742326+08:00||;True|2025-04-28T18:34:57.6622084+08:00||;True|2025-04-28T13:05:23.6608249+08:00||;True|2025-04-28T09:37:26.7461458+08:00||;True|2025-04-28T09:35:49.4586494+08:00||;True|2025-04-23T09:20:16.5810299+08:00||;True|2025-04-22T14:55:52.6602616+08:00||;True|2025-04-22T14:52:09.2986761+08:00||;True|2025-04-22T14:35:55.6073919+08:00||;True|2025-04-21T17:25:11.3783000+08:00||;True|2025-04-15T02:22:50.8483367+08:00||;True|2025-04-14T17:01:19.3567029+08:00||;True|2025-04-10T16:29:29.4614826+08:00||;True|2025-04-03T12:04:01.6354165+08:00||;True|2025-03-28T14:28:57.3291596+08:00||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <History>True|2025-11-11T06:42:15.2817665Z||;True|2025-11-10T17:55:37.2391325+08:00||;True|2025-11-10T17:13:43.4800497+08:00||;True|2025-11-08T19:29:01.1502973+08:00||;True|2025-10-31T08:57:33.8830804+08:00||;True|2025-10-30T20:50:33.1401136+08:00||;True|2025-10-30T20:29:13.9337574+08:00||;True|2025-10-30T19:56:28.1077291+08:00||;True|2025-10-30T13:21:26.9927646+08:00||;True|2025-10-24T19:18:08.4129813+08:00||;True|2025-09-29T17:17:51.1103513+08:00||;True|2025-08-29T14:18:40.5594388+08:00||;True|2025-08-28T18:15:38.3971489+08:00||;True|2025-08-28T18:15:06.7333272+08:00||;True|2025-08-27T18:35:09.5980695+08:00||;True|2025-08-26T19:16:55.3617645+08:00||;True|2025-08-21T10:27:13.8176169+08:00||;True|2025-06-26T08:55:26.5542141+08:00||;True|2025-06-25T09:11:45.3214896+08:00||;True|2025-05-23T13:03:55.7681923+08:00||;True|2025-05-23T12:30:20.3979750+08:00||;True|2025-05-06T18:44:59.6980994+08:00||;True|2025-05-06T18:39:53.5994195+08:00||;True|2025-05-06T15:31:35.4635552+08:00||;True|2025-05-06T14:42:04.8934173+08:00||;True|2025-04-28T20:38:10.9382378+08:00||;True|2025-04-28T19:02:47.1742326+08:00||;True|2025-04-28T18:34:57.6622084+08:00||;True|2025-04-28T13:05:23.6608249+08:00||;True|2025-04-28T09:37:26.7461458+08:00||;True|2025-04-28T09:35:49.4586494+08:00||;True|2025-04-23T09:20:16.5810299+08:00||;True|2025-04-22T14:55:52.6602616+08:00||;True|2025-04-22T14:52:09.2986761+08:00||;True|2025-04-22T14:35:55.6073919+08:00||;True|2025-04-21T17:25:11.3783000+08:00||;True|2025-04-15T02:22:50.8483367+08:00||;True|2025-04-14T17:01:19.3567029+08:00||;True|2025-04-10T16:29:29.4614826+08:00||;True|2025-04-03T12:04:01.6354165+08:00||;True|2025-03-28T14:28:57.3291596+08:00||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>
MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ