zyf
2025-04-12 b2be3b6939b4382f9165c78857a072f1aa7b01d0
更新平板功能,首检页面生成巡检单
已修改30个文件
已添加2个文件
1067 ■■■■■ 文件已修改
MES.Service/Dto/service/SJPageResult.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/ExZzCaaFiled.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/QsItemOqcReq.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/QsQaItemXj.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Womcaa.cs 516 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Womdaa.cs 373 ●●●● 补丁 | 查看 | 原始文档 | 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/QC/RKJService.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QC/SJService.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QC/XJService.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/WomcaaManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/QC/SJController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | 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/Debug/net8.0/log/2025041114.log 9 ●●●●● 补丁 | 查看 | 原始文档 | 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/service/SJPageResult.cs
@@ -82,6 +82,15 @@
    /// </summary>
    [SugarColumn(ColumnName = "DAA008")]
    public decimal? Daa008 { get; set; }
    [SugarColumn(ColumnName = "CAA015")]
    public string? Caa015 { get; set; }
    [SugarColumn(ColumnName = "CUST")]
    public string? Cust { get; set; }
    [SugarColumn(ColumnName = "XJ_GEN_FLAG")]
    public int? XjGenFlag { get; set; }
    [SugarColumn(IsIgnore = true)] public string? SearchValue { get; set; }
MES.Service/Modes/ExZzCaaFiled.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// æ€»è£…任务单专属字段表
    ///</summary>
    [SugarTable("EX_ZZ_CAA_FILED")]
    public class ExZzCaaFiled
    {
        /// <summary>
        /// ä»»åŠ¡å•ERPID
        ///</summary>
         [SugarColumn(ColumnName="ERPID"    )]
         public decimal? Erpid { get; set; }
        /// <summary>
        /// å®¢æˆ·
        ///</summary>
         [SugarColumn(ColumnName="CUST"    )]
         public string? Cust { get; set; }
        /// <summary>
        /// æ‰“标领料人
        ///</summary>
         [SugarColumn(ColumnName="DB_PICKER"    )]
         public string? DbPicker { get; set; }
    }
}
MES.Service/Modes/QsItemOqcReq.cs
@@ -135,4 +135,8 @@
    [SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; }
    
    [SugarColumn(IsIgnore = true)] public string? Bgr { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Caa015 { get; set; }
    [SugarColumn(IsIgnore = true)] public string? cust { get; set; }
}
MES.Service/Modes/QsQaItemXj.cs
@@ -20,6 +20,10 @@
        ColumnName = "ID")] //用于SqlSugar
    public decimal? Id { get; set; }
    [SugarColumn(ColumnName = "SJID")]
    public decimal? Sjid { get; set; }
    /// <summary>
    ///     æ£€éªŒå•号
    /// </summary>
@@ -130,4 +134,8 @@
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Caa015 { get; set; }
    [SugarColumn(IsIgnore = true)] public string? cust { get; set; }
}
MES.Service/Modes/Womcaa.cs
@@ -1,282 +1,242 @@
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     å·¥å•表
/// </summary>
[SugarTable("WOMCAA")]
public class Womcaa
namespace MES.Service.Modes
{
    /// <summary>
    ///     è‡ªå¢žåˆ—  SEQ_AOI
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
    /// ä»»åŠ¡å•è¡¨
    ///</summary>
    [SugarTable("WOMCAA")]
    public class Womcaa
    {
        /// <summary>
        /// è‡ªå¢žåˆ—
        ///</summary>
         [SugarColumn(ColumnName="ID", IsPrimaryKey = true,
        OracleSequenceName = "SEQ_AOI")]
    public decimal? Id { get; set; }
    /// <summary>
    ///     ERPID
    /// </summary>
    [SugarColumn(ColumnName = "ERPID")]
    public decimal? Erpid { get; set; }
    /// <summary>
    ///     å•号
    /// </summary>
    [SugarColumn(ColumnName = "CAA001")]
    public string? Caa001 { get; set; }
    /// <summary>
    ///     å•据类型 1、直接入库-普通生产 SCDD03_SYS2、直接入库-返工生产 SCDD04_SYS3、工序汇报-普通生产
    ///     SCDD01_SYS4、工序汇报-返工生产 SCDD02_SYS
    /// </summary>
    [SugarColumn(ColumnName = "CAA004")]
    public string? Caa004 { get; set; }
    /// <summary>
    ///     å¼€å•日期
    /// </summary>
    [SugarColumn(ColumnName = "CAA005")]
    public string? Caa005 { get; set; }
    /// <summary>
    ///     äº§å“ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "CAA006")]
    public string? Caa006 { get; set; }
    /// <summary>
    ///     å•位
    /// </summary>
    [SugarColumn(ColumnName = "CAA009")]
    public string? Caa009 { get; set; }
    /// <summary>
    ///     é¢„计开工时间
    /// </summary>
    [SugarColumn(ColumnName = "CAA010")]
    public string? Caa010 { get; set; }
    /// <summary>
    ///     é¢„计完工时间
    /// </summary>
    [SugarColumn(ColumnName = "CAA011")]
    public string? Caa011 { get; set; }
    /// <summary>
    ///     æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "CAA012")]
    public decimal? Caa012 { get; set; }
    /// <summary>
    ///     BOM版次
    /// </summary>
    [SugarColumn(ColumnName = "CAA013")]
    public string? Caa013 { get; set; }
    /// <summary>
    ///     é”€å”®è®¢å•号
    /// </summary>
    [SugarColumn(ColumnName = "CAA015")]
    public string? Caa015 { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "CAA016")]
    public string? Caa016 { get; set; }
    /// <summary>
    ///     å·²æŽ’数量
    /// </summary>
    [SugarColumn(ColumnName = "CAA017")]
    public decimal? Caa017 { get; set; }
    /// <summary>
    ///     ERP源单ID
    /// </summary>
    [SugarColumn(ColumnName = "CAA018")]
    public decimal? Caa018 { get; set; }
    /// <summary>
    ///     ERP源单行号
    /// </summary>
    [SugarColumn(ColumnName = "CAA019")]
    public decimal? Caa019 { get; set; }
    /// <summary>
    ///     ERP源单单号(任务单号)
    /// </summary>
    [SugarColumn(ColumnName = "CAA020")]
    public string? Caa020 { get; set; }
    /// <summary>
    ///     å·¥ä½œè½¦é—´
    /// </summary>
    [SugarColumn(ColumnName = "CAA021")]
    public string? Caa021 { get; set; }
    /// <summary>
    ///     å®¡æ ¸ç 
    /// </summary>
    [SugarColumn(ColumnName = "FSTATUS")]
    public decimal? Fstatus { get; set; }
    /// <summary>
    ///     å®¡æ ¸æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_DATE")]
    public DateTime? CheckDate { get; set; }
    /// <summary>
    ///     å®¡æ ¸äºº
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_USER")]
    public string? CheckUser { get; set; }
    /// <summary>
    ///     æœªæŽ’数量
    /// </summary>
    [SugarColumn(ColumnName = "CAA022")]
    public decimal? Caa022 { get; set; }
    /// <summary>
    ///     çŠ¶æ€ å®Œå·¥ï¼Œæœªå®Œå·¥
    /// </summary>
    [SugarColumn(ColumnName = "CAA023")]
    public string? Caa023 { get; set; }
    /// <summary>
    ///     å·²å…¥åº“数量
    /// </summary>
    [SugarColumn(ColumnName = "CAA024")]
    public decimal? Caa024 { get; set; }
    /// <summary>
    ///     å·¥è‰ºè·¯çº¿
    /// </summary>
    [SugarColumn(ColumnName = "ROUTING_ID")]
    public string? RoutingId { get; set; }
    /// <summary>
    ///     äº§çº¿
    /// </summary>
    [SugarColumn(ColumnName = "WORK_SHOP_ID")]
    public string? WorkShopId { get; set; }
    /// <summary>
    ///     ä»“库
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }
    /// <summary>
    ///     å•据日期
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public string? CreateDate { get; set; }
    /// <summary>
    ///     è®¡åˆ’组
    /// </summary>
    [SugarColumn(ColumnName = "WORK_GROUP_ID")]
    public string? WorkGroupId { get; set; }
    /// <summary>
    ///     è®¡åˆ’员
    /// </summary>
    [SugarColumn(ColumnName = "PLAN_ID")]
    public string? PlanId { get; set; }
    /// <summary>
    ///     å…¥åº“上限
    /// </summary>
    [SugarColumn(ColumnName = "STOCK_INLIMITH")]
    public string? StockInlimith { get; set; }
    /// <summary>
    ///     å…¥åº“下限
    /// </summary>
    [SugarColumn(ColumnName = "STOCK_INLIMITL")]
    public string? StockInlimitl { get; set; }
    /// <summary>
    ///     è®¡åˆ’跟踪号
    /// </summary>
    [SugarColumn(ColumnName = "MTONO")]
    public string? Mtono { get; set; }
    /// <summary>
    ///     æ‰¹å·
    /// </summary>
    [SugarColumn(ColumnName = "LOT")]
    public string? Lot { get; set; }
    /// <summary>
    ///     é”€å”®è®¢å•行号
    /// </summary>
    [SugarColumn(ColumnName = "CAA015_HEAD")]
    public string? Caa015Head { get; set; }
    /// <summary>
    ///     ç”Ÿæˆæ–¹å¼
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_TYPE")]
    public string? CreateType { get; set; }
    /// <summary>
    ///     æºå•类型
    /// </summary>
    [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
    public string? SrcBillType { get; set; }
    /// <summary>
    ///     æºå•编号
    /// </summary>
    [SugarColumn(ColumnName = "SRC_BILL_NO")]
    public string? SrcBillNo { get; set; }
    /// <summary>
    ///     æºå•分录行号
    /// </summary>
    [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
    public string? SrcBillentryseq { get; set; }
    /// <summary>
    ///     éœ€æ±‚单据号
    /// </summary>
    [SugarColumn(ColumnName = "SALE_ORDER_NO")]
    public string? SaleOrderNo { get; set; }
    /// <summary>
    ///     éœ€æ±‚单据行号
    /// </summary>
    [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
    public string? SaleOrderEntryseq { get; set; }
    /// <summary>
    ///     ç»“案人
    /// </summary>
    [SugarColumn(ColumnName = "FORCE_CLOSERID")]
    public string? ForceCloserid { get; set; }
    /// <summary>
    ///     ç»“案类型
    /// </summary>
    [SugarColumn(ColumnName = "CLOSE_TYPE")]
    public string? CloseType { get; set; }
    /// <summary>
    ///     æºæ‹†åˆ†è®¢å•编号
    /// </summary>
    [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
    public string? SrcSplitBillno { get; set; }
    /// <summary>
    ///     ç”Ÿäº§è®¢å•行内码
    /// </summary>
    [SugarColumn(ColumnName = "FMOENTRYID")]
    public decimal? FMOENTRYID { get; set; }
}
         public decimal? Id { get; set; }
        /// <summary>
        /// ERPID
        ///</summary>
         [SugarColumn(ColumnName="ERPID"    )]
         public decimal? Erpid { get; set; }
        /// <summary>
        /// å•据编号
        ///</summary>
         [SugarColumn(ColumnName="CAA001"    )]
         public string? Caa001 { get; set; }
        /// <summary>
        /// å•据类型
        ///</summary>
         [SugarColumn(ColumnName="CAA004"    )]
         public string? Caa004 { get; set; }
        /// <summary>
        /// è®¡åˆ’下达日期
        ///</summary>
         [SugarColumn(ColumnName="CAA005"    )]
         public string? Caa005 { get; set; }
        /// <summary>
        /// äº§å“ç¼–码
        ///</summary>
         [SugarColumn(ColumnName="CAA006"    )]
         public string? Caa006 { get; set; }
        /// <summary>
        /// å•位
        ///</summary>
         [SugarColumn(ColumnName="CAA009"    )]
         public string? Caa009 { get; set; }
        /// <summary>
        /// é¢„计开工时间
        ///</summary>
         [SugarColumn(ColumnName="CAA010"    )]
         public string? Caa010 { get; set; }
        /// <summary>
        /// é¢„计完工时间
        ///</summary>
         [SugarColumn(ColumnName="CAA011"    )]
         public string? Caa011 { get; set; }
        /// <summary>
        /// å·¥å•数量
        ///</summary>
         [SugarColumn(ColumnName="CAA012"    )]
         public decimal? Caa012 { get; set; }
        /// <summary>
        /// BOM版次
        ///</summary>
         [SugarColumn(ColumnName="CAA013"    )]
         public string? Caa013 { get; set; }
        /// <summary>
        /// é”€å”®è®¢å•号
        ///</summary>
         [SugarColumn(ColumnName="CAA015"    )]
         public string? Caa015 { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        ///</summary>
         [SugarColumn(ColumnName="CAA016"    )]
         public string? Caa016 { get; set; }
        /// <summary>
        /// å·²æŽ’数量(弃用)
        ///</summary>
         [SugarColumn(ColumnName="CAA017"    )]
         public decimal? Caa017 { get; set; }
        /// <summary>
        /// ERP生产订单ID
        ///</summary>
         [SugarColumn(ColumnName="CAA018"    )]
         public decimal? Caa018 { get; set; }
        /// <summary>
        /// ERP生产订单序号
        ///</summary>
         [SugarColumn(ColumnName="CAA019"    )]
         public decimal? Caa019 { get; set; }
        /// <summary>
        /// ERP生产订单单号
        ///</summary>
         [SugarColumn(ColumnName="CAA020"    )]
         public string? Caa020 { get; set; }
        /// <summary>
        /// ç”Ÿäº§è½¦é—´
        ///</summary>
         [SugarColumn(ColumnName="CAA021"    )]
         public string? Caa021 { get; set; }
        /// <summary>
        /// å®¡æ ¸ç 
        ///</summary>
         [SugarColumn(ColumnName="FSTATUS"    )]
         public decimal? Fstatus { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="CHECK_DATE"    )]
         public DateTime? CheckDate { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº
        ///</summary>
         [SugarColumn(ColumnName="CHECK_USER"    )]
         public string? CheckUser { get; set; }
        /// <summary>
        /// æœªæŽ’数量(弃用)
        ///</summary>
         [SugarColumn(ColumnName="CAA022"    )]
         public decimal? Caa022 { get; set; }
        /// <summary>
        /// &quot;工单状态 1、计划 2、计划确认 3、下达 4、开工 5、完工 6、结案 7、结算&quot;
        ///</summary>
         [SugarColumn(ColumnName="CAA023"    )]
         public string? Caa023 { get; set; }
        /// <summary>
        /// å·²å…¥åº“数量
        ///</summary>
         [SugarColumn(ColumnName="CAA024"    )]
         public decimal? Caa024 { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿
        ///</summary>
         [SugarColumn(ColumnName="ROUTING_ID"    )]
         public string? RoutingId { get; set; }
        /// <summary>
        /// äº§çº¿
        ///</summary>
         [SugarColumn(ColumnName="WORK_SHOP_ID"    )]
         public string? WorkShopId { get; set; }
        /// <summary>
        /// ä»“库
        ///</summary>
         [SugarColumn(ColumnName="DEPOT_CODE"    )]
         public string? DepotCode { get; set; }
        /// <summary>
        /// å•据日期
        ///</summary>
         [SugarColumn(ColumnName="CREATE_DATE"    )]
         public string? CreateDate { get; set; }
        /// <summary>
        /// è®¡åˆ’组
        ///</summary>
         [SugarColumn(ColumnName="WORK_GROUP_ID"    )]
         public string? WorkGroupId { get; set; }
        /// <summary>
        /// è®¡åˆ’员
        ///</summary>
         [SugarColumn(ColumnName="PLAN_ID"    )]
         public string? PlanId { get; set; }
        /// <summary>
        /// å…¥åº“上限
        ///</summary>
         [SugarColumn(ColumnName="STOCK_INLIMITH"    )]
         public string? StockInlimith { get; set; }
        /// <summary>
        /// å…¥åº“下限
        ///</summary>
         [SugarColumn(ColumnName="STOCK_INLIMITL"    )]
         public string? StockInlimitl { get; set; }
        /// <summary>
        /// è®¡åˆ’跟踪号
        ///</summary>
         [SugarColumn(ColumnName="MTONO"    )]
         public string? Mtono { get; set; }
        /// <summary>
        /// æ‰¹å·
        ///</summary>
         [SugarColumn(ColumnName="LOT"    )]
         public string? Lot { get; set; }
        /// <summary>
        /// é”€å”®è®¢å•行号
        ///</summary>
         [SugarColumn(ColumnName="CAA015_HEAD"    )]
         public string? Caa015Head { get; set; }
        /// <summary>
        /// ç”Ÿæˆæ–¹å¼
        ///</summary>
         [SugarColumn(ColumnName="CREATE_TYPE"    )]
         public string? CreateType { get; set; }
        /// <summary>
        /// æºå•类型
        ///</summary>
         [SugarColumn(ColumnName="SRC_BILL_TYPE"    )]
         public string? SrcBillType { get; set; }
        /// <summary>
        /// æºå•编码
        ///</summary>
         [SugarColumn(ColumnName="SRC_BILL_NO"    )]
         public string? SrcBillNo { get; set; }
        /// <summary>
        /// æºå•分录行号
        ///</summary>
         [SugarColumn(ColumnName="SRC_BILLENTRYSEQ"    )]
         public string? SrcBillentryseq { get; set; }
        /// <summary>
        /// éœ€æ±‚单据号
        ///</summary>
         [SugarColumn(ColumnName="SALE_ORDER_NO"    )]
         public string? SaleOrderNo { get; set; }
        /// <summary>
        /// éœ€æ±‚单据行号
        ///</summary>
         [SugarColumn(ColumnName="SALE_ORDER_ENTRYSEQ"    )]
         public string? SaleOrderEntryseq { get; set; }
        /// <summary>
        /// ç»“案人
        ///</summary>
         [SugarColumn(ColumnName="FORCE_CLOSERID"    )]
         public string? ForceCloserid { get; set; }
        /// <summary>
        /// ç»“案类型
        ///</summary>
         [SugarColumn(ColumnName="CLOSE_TYPE"    )]
         public string? CloseType { get; set; }
        /// <summary>
        /// æºæ‹†åˆ†è®¢å•编号
        ///</summary>
         [SugarColumn(ColumnName="SRC_SPLIT_BILLNO"    )]
         public string? SrcSplitBillno { get; set; }
        /// <summary>
        /// ç”Ÿäº§è®¢å•行内码
        ///</summary>
         [SugarColumn(ColumnName="FMOENTRYID"    )]
         public decimal? Fmoentryid { get; set; }
        /// <summary>
        /// æŽ’产线别
        ///</summary>
         [SugarColumn(ColumnName="PROD_LINE"    )]
         public string? ProdLine { get; set; }
    }
}
MES.Service/Modes/Womdaa.cs
@@ -13,304 +13,335 @@
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal? Id { get; set; }
    /// <summary>
    ///     æŽ’产ID
    /// </summary>
    /// æŽ’产ID
    ///</summary>
    [SugarColumn(ColumnName = "PID")]
    public decimal? Pid { get; set; }
    /// <summary>
    ///     å•号
    /// </summary>
    /// å•号
    ///</summary>
    [SugarColumn(ColumnName = "DAA001")]
    public string? Daa001 { get; set; }
    public string Daa001 { get; set; }
    /// <summary>
    ///     äº§å“ID
    /// </summary>
    /// äº§å“ID
    ///</summary>
    [SugarColumn(ColumnName = "DAA002")]
    public string? Daa002 { get; set; }
    public string Daa002 { get; set; }
    /// <summary>
    ///     äº§å“åç§°
    /// </summary>
    /// äº§å“åç§°
    ///</summary>
    [SugarColumn(ColumnName = "DAA003")]
    public string? Daa003 { get; set; }
    public string Daa003 { get; set; }
    /// <summary>
    ///     äº§å“è§„æ ¼
    /// </summary>
    /// äº§å“è§„æ ¼
    ///</summary>
    [SugarColumn(ColumnName = "DAA004")]
    public string? Daa004 { get; set; }
    public string Daa004 { get; set; }
    /// <summary>
    ///     å•位
    /// </summary>
    /// å•位
    ///</summary>
    [SugarColumn(ColumnName = "DAA005")]
    public string? Daa005 { get; set; }
    public string Daa005 { get; set; }
    /// <summary>
    ///     ERP预计开工时间
    /// </summary>
    /// ERP预计开工时间
    ///</summary>
    [SugarColumn(ColumnName = "DAA006")]
    public DateTime? Daa006 { get; set; }
    /// <summary>
    ///     ERP预计完工时间
    /// </summary>
    /// ERP预计完工时间
    ///</summary>
    [SugarColumn(ColumnName = "DAA007")]
    public DateTime? Daa007 { get; set; }
    /// <summary>
    ///     å·¥å•数量
    /// </summary>
    /// å·¥å•数量
    ///</summary>
    [SugarColumn(ColumnName = "DAA008")]
    public decimal? Daa008 { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    /// å¤‡æ³¨
    ///</summary>
    [SugarColumn(ColumnName = "DAA009")]
    public string? Daa009 { get; set; }
    public string Daa009 { get; set; }
    /// <summary>
    ///     å…¥åº“数量
    /// </summary>
    /// å…¥åº“数量
    ///</summary>
    [SugarColumn(ColumnName = "DAA010")]
    public decimal? Daa010 { get; set; }
    /// <summary>
    ///     å·²ç”Ÿäº§é‡
    /// </summary>
    /// å·²ç”Ÿäº§é‡
    ///</summary>
    [SugarColumn(ColumnName = "DAA011")]
    public decimal? Daa011 { get; set; }
    /// <summary>
    ///     æŠ¥åºŸæ•°é‡
    /// </summary>
    /// æŠ¥åºŸæ•°é‡
    ///</summary>
    [SugarColumn(ColumnName = "DAA012")]
    public decimal? Daa012 { get; set; }
    /// <summary>
    ///     å·¥ä½œè½¦é—´
    /// </summary>
    /// å·¥ä½œè½¦é—´
    ///</summary>
    [SugarColumn(ColumnName = "DAA013")]
    public string? Daa013 { get; set; }
    public string Daa013 { get; set; }
    /// <summary>
    ///     æŠ•料单单号
    /// </summary>
    /// æŠ•料单单号
    ///</summary>
    [SugarColumn(ColumnName = "DAA014")]
    public string? Daa014 { get; set; }
    public string Daa014 { get; set; }
    /// <summary>
    ///     ç”Ÿäº§çº¿åˆ«
    /// </summary>
    /// ç”Ÿäº§çº¿åˆ«
    ///</summary>
    [SugarColumn(ColumnName = "DAA015")]
    public string? Daa015 { get; set; }
    public string Daa015 { get; set; }
    /// <summary>
    ///     å®žé™…开工日
    /// </summary>
    /// å®žé™…开工日
    ///</summary>
    [SugarColumn(ColumnName = "DAA016")]
    public DateTime? Daa016 { get; set; }
    /// <summary>
    ///     å®žé™…完工日
    /// </summary>
    /// å®žé™…完工日
    ///</summary>
    [SugarColumn(ColumnName = "DAA017")]
    public DateTime? Daa017 { get; set; }
    /// <summary>
    ///     å·¥å•状态
    /// </summary>
    /// å·¥å•状态
    ///</summary>
    [SugarColumn(ColumnName = "DAA018")]
    public string? Daa018 { get; set; }
    public string Daa018 { get; set; }
    /// <summary>
    ///     é½å¥—状态
    /// </summary>
    /// é½å¥—状态
    ///</summary>
    [SugarColumn(ColumnName = "DAA019")]
    public string? Daa019 { get; set; }
    public string Daa019 { get; set; }
    /// <summary>
    ///     å®¡æ ¸ç 
    /// </summary>
    /// å®¡æ ¸ç 
    ///</summary>
    [SugarColumn(ColumnName = "FSTATUS")]
    public decimal? Fstatus { get; set; }
    /// <summary>
    ///     å®¡æ ¸æ—¥æœŸ
    /// </summary>
    /// å®¡æ ¸æ—¥æœŸ
    ///</summary>
    [SugarColumn(ColumnName = "CHECK_DATE")]
    public DateTime? CheckDate { get; set; }
    /// <summary>
    ///     å®¡æ ¸äºº
    /// </summary>
    /// å®¡æ ¸äºº
    ///</summary>
    [SugarColumn(ColumnName = "CHECK_USER")]
    public string? CheckUser { get; set; }
    public string CheckUser { get; set; }
    /// <summary>
    ///     çº¿åˆ«ç¼–码
    /// </summary>
    /// çº¿åˆ«ç¼–码
    ///</summary>
    [SugarColumn(ColumnName = "DAA020")]
    public string? Daa020 { get; set; }
    public string Daa020 { get; set; }
    /// <summary>
    ///     ä»»åŠ¡å•å•å·
    /// </summary>
    /// ä»»åŠ¡å•å•å·
    ///</summary>
    [SugarColumn(ColumnName = "DAA021")]
    public string? Daa021 { get; set; }
    public string Daa021 { get; set; }
    /// <summary>
    ///     é€šçŸ¥å¤‡æ–™ï¼Œ0-未通知,1-通知
    /// </summary>
    /// é€šçŸ¥å¤‡æ–™ï¼Œ0-未通知,1-通知
    ///</summary>
    [SugarColumn(ColumnName = "DAA022")]
    public decimal? Daa022 { get; set; }
    /// <summary>
    ///     ç”Ÿäº§åºå·
    /// </summary>
    /// ç”Ÿäº§åºå·
    ///</summary>
    [SugarColumn(ColumnName = "DAA023")]
    public decimal? Daa023 { get; set; }
    /// <summary>
    ///     æŽ’产日期
    /// </summary>
    /// æŽ’产日期
    ///</summary>
    [SugarColumn(ColumnName = "DAA024")]
    public string? Daa024 { get; set; }
    public string Daa024 { get; set; }
    /// <summary>
    ///     é¦–件是否检验1-检验,0未检验
    /// </summary>
    /// é¦–件是否检验1-检验,0未检验
    ///</summary>
    [SugarColumn(ColumnName = "DAA025")]
    public string? Daa025 { get; set; }
    public string Daa025 { get; set; }
    /// <summary>
    ///     é¦–件检验结果
    /// </summary>
    /// é¦–件检验结果
    ///</summary>
    [SugarColumn(ColumnName = "DAA026")]
    public string? Daa026 { get; set; }
    public string Daa026 { get; set; }
    /// <summary>
    ///     å·²æŠ¥æ£€ï¼Œ0-未报检,1-已报检
    /// </summary>
    /// å·²æŠ¥æ£€ï¼Œ0-未报检,1-已报检
    ///</summary>
    [SugarColumn(ColumnName = "IS_REPORTCHECK")]
    public decimal? IsReportcheck { get; set; }
    /// <summary>
    ///     æŠ¥æ£€äºº
    /// </summary>
    /// æŠ¥æ£€äºº
    ///</summary>
    [SugarColumn(ColumnName = "USNAME")]
    public string? Usname { get; set; }
    public string Usname { get; set; }
    /// <summary>
    ///     æŠ¥æ£€æ—¶é—´
    /// </summary>
    /// æŠ¥æ£€æ—¶é—´
    ///</summary>
    [SugarColumn(ColumnName = "REPORTTIME")]
    public DateTime? Reporttime { get; set; }
    /// <summary>
    ///     æœºå°ç¼–号
    /// </summary>
    /// æœºå°ç¼–号
    ///</summary>
    [SugarColumn(ColumnName = "MACHINE_NO")]
    public string? MachineNo { get; set; }
    public string MachineNo { get; set; }
    /// <summary>
    ///     å¤‡æ–™å®Œæˆ1-完成,0未完成
    /// </summary>
    /// å¤‡æ–™å®Œæˆ1-完成,0未完成
    ///</summary>
    [SugarColumn(ColumnName = "DAA027")]
    public decimal? Daa027 { get; set; }
    /// <summary>
    ///     å¤‡æ–™å®Œæˆæ—¶é—´
    /// </summary>
    /// å¤‡æ–™å®Œæˆæ—¶é—´
    ///</summary>
    [SugarColumn(ColumnName = "DAA028")]
    public string? Daa028 { get; set; }
    public string Daa028 { get; set; }
    /// <summary>
    ///     æ ‡å‡†å·¥æ—¶
    /// </summary>
    /// æ ‡å‡†å·¥æ—¶
    ///</summary>
    [SugarColumn(ColumnName = "PROD_HOUR")]
    public decimal? ProdHour { get; set; }
    /// <summary>
    ///     å•人小时产能
    /// </summary>
    /// å•人小时产能
    ///</summary>
    [SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")]
    public decimal? PersonHourCapacity { get; set; }
    /// <summary>
    ///     ç†è®ºæ ‡äº§
    /// </summary>
    /// ç†è®ºæ ‡äº§
    ///</summary>
    [SugarColumn(ColumnName = "THE_CAPACITY")]
    public decimal? TheCapacity { get; set; }
    /// <summary>
    ///     è®¡åˆ’用人数
    /// </summary>
    /// è®¡åˆ’用人数
    ///</summary>
    [SugarColumn(ColumnName = "PLAN_PERSONNEL")]
    public decimal? PlanPersonnel { get; set; }
    /// <summary>
    ///     è®¡åˆ’标准产能
    /// </summary>
    /// è®¡åˆ’标准产能
    ///</summary>
    [SugarColumn(ColumnName = "PLAN_CAPACITY")]
    public decimal? PlanCapacity { get; set; }
    /// <summary>
    ///     ç†è®ºç”¨æ—¶/M
    /// </summary>
    /// ç†è®ºç”¨æ—¶/M
    ///</summary>
    [SugarColumn(ColumnName = "THE_MIN")]
    public decimal? TheMin { get; set; }
    /// <summary>
    ///     ç†è®ºç”¨æ—¶/H
    /// </summary>
    /// ç†è®ºç”¨æ—¶/H
    ///</summary>
    [SugarColumn(ColumnName = "THE_HOUR")]
    public decimal? TheHour { get; set; }
    /// <summary>
    ///     çº¿ä½“类别
    /// </summary>
    /// çº¿ä½“类别
    ///</summary>
    [SugarColumn(ColumnName = "LINE_TYPE")]
    public string? LineType { get; set; }
    public string LineType { get; set; }
    /// <summary>
    ///     æ ‡å‡†äººæ•°
    /// </summary>
    /// æ ‡å‡†äººæ•°
    ///</summary>
    [SugarColumn(ColumnName = "PERSONNEL")]
    public decimal? Personnel { get; set; }
    /// <summary>
    ///     æ¢çº¿æ—¶é—´
    /// </summary>
    /// æ¢çº¿æ—¶é—´
    ///</summary>
    [SugarColumn(ColumnName = "CHANGE_LINE_TIME")]
    public decimal? ChangeLineTime { get; set; }
    /// <summary>
    ///     ä¼‘息时间
    /// </summary>
    /// ä¼‘息时间
    ///</summary>
    [SugarColumn(ColumnName = "REST_TIME")]
    public decimal? RestTime { get; set; }
    /// <summary>
    ///     æŽ’产序号
    /// </summary>
    /// æŽ’产序号
    ///</summary>
    [SugarColumn(ColumnName = "SCHEDULE_ORDER")]
    public decimal? ScheduleOrder { get; set; }
    /// <summary>
    ///     MES预计开工时间
    /// </summary>
    /// MES预计开工时间
    ///</summary>
    [SugarColumn(ColumnName = "MES_START_PROD")]
    public DateTime? MesStartProd { get; set; }
    /// <summary>
    ///     MES预计完工时间
    /// </summary>
    /// MES预计完工时间
    ///</summary>
    [SugarColumn(ColumnName = "MES_END_PROD")]
    public DateTime? MesEndProd { get; set; }
    /// <summary>
    /// æŽ’产推送标识
    ///</summary>
    [SugarColumn(ColumnName = "PRODTS")]
    public decimal? Prodts { get; set; }
    /// <summary>
    /// é¢„计备料时间
    ///</summary>
    [SugarColumn(ColumnName = "PREPARE_TIME")]
    public DateTime? PrepareTime { get; set; }
    /// <summary>
    /// æ’件投入人数
    ///</summary>
    [SugarColumn(ColumnName = "CJ_WORKER")]
    public decimal? CjWorker { get; set; }
    /// <summary>
    /// æ’件计划投入人数
    ///</summary>
    [SugarColumn(ColumnName = "P_CJ_WORKER")]
    public decimal? PCjWorker { get; set; }
    /// <summary>
    /// æ’件日产量
    ///</summary>
    [SugarColumn(ColumnName = "CJ_DAILY_OUT")]
    public decimal? CjDailyOut { get; set; }
    /// <summary>
    /// æ’件标准工时
    ///</summary>
    [SugarColumn(ColumnName = "CJ_STD_HOUR")]
    public decimal? CjStdHour { get; set; }
    /// <summary>
    /// é”¡ç„ŠæŠ•å…¥äººæ•°
    ///</summary>
    [SugarColumn(ColumnName = "HX_WORKER")]
    public decimal? HxWorker { get; set; }
    /// <summary>
    /// é”¡ç„Šè®¡åˆ’投入人数
    ///</summary>
    [SugarColumn(ColumnName = "P_HX_WORKER")]
    public decimal? PHxWorker { get; set; }
    /// <summary>
    /// é”¡ç„Šæ—¥äº§é‡
    ///</summary>
    [SugarColumn(ColumnName = "HX_DAILY_OUT")]
    public decimal? HxDailyOut { get; set; }
    /// <summary>
    /// é”¡ç„Šæ ‡å‡†å·¥æ—¶
    ///</summary>
    [SugarColumn(ColumnName = "HX_STD_HOUR")]
    public decimal? HxStdHour { get; set; }
    /// <summary>
    /// æ’件数量
    ///</summary>
    [SugarColumn(ColumnName = "CJ_NUM")]
    public decimal? CjNum { get; set; }
    /// <summary>
    /// å®¢æˆ·
    ///</summary>
    [SugarColumn(ColumnName = "CUST")]
    public string Cust { get; set; }
    /// <summary>
    /// æ€»è£…工序 1打标 4加工 2组装 3包装
    ///</summary>
    [SugarColumn(ColumnName = "ZZ_GX")]
    public decimal? ZzGx { get; set; }
    /// <summary>
    /// é€šçŸ¥å¤‡æ–™æ—¶é—´
    ///</summary>
    [SugarColumn(ColumnName = "DAA029")]
    public DateTime? Daa029 { get; set; }
    /// <summary>
    /// é”€å”®è®¢å•号(目前三楼增补使用)
    ///</summary>
    [SugarColumn(ColumnName = "XSDDH")]
    public string Xsddh { get; set; }
    /// <summary>
    ///
    ///</summary>
    [SugarColumn(ColumnName = "TEST")]
    public decimal? Test { get; set; }
}
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/QC/RKJService.cs
@@ -599,8 +599,8 @@
        var qsItemOqcReqs = db
            .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
                RKJDaa001, Womdaa, VLineUser,MesDeptUser>(
                (a, b, c, ca, m, da, z,d) => new JoinQueryInfos(
                RKJDaa001, Womdaa, VLineUser,MesDeptUser, Womcaa, ExZzCaaFiled>(
                (a, b, c, ca, m, da, z,d, caa,zf) => new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo,
                    JoinType.Left, a.BillNo == c.BillNo,
                    JoinType.Left,
@@ -610,28 +610,30 @@
                    JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
                    JoinType.Left, da.Daa001 == c.RbillNo,
                    JoinType.Left, da.Daa015 == z.LineNo,
                    JoinType.Left,c.Bgr == d.UserNo
                    JoinType.Left,c.Bgr == d.UserNo,
                    JoinType.Left, da.Daa021 == caa.Caa020,
                    JoinType.Left, caa.Erpid == zf.Erpid
                ))
            // .WhereIF(lineNo != null && lineNo.Length > 0,
            //     (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
            .WhereIF(!"PL017".Equals(queryObj.createUser),
                (a, b, c, ca, m, da, z,d) => lineNo.Contains(da.Daa015))
                (a, b, c, ca, m, da, z, d, caa, zf) => lineNo.Contains(da.Daa015))
            .WhereIF(!string.IsNullOrEmpty(queryObj.id),
                (a, b, c, ca, m, da, z,d) => a.Id.ToString() == queryObj.id)
                (a, b, c, ca, m, da, z, d, caa, zf) => a.Id.ToString() == queryObj.id)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b, c, ca, m, da, z,d) => a.FcheckResu == null)
                (a, b, c, ca, m, da, z, d, caa, zf) => a.FcheckResu == null)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (a, b, c, ca, m, da, z,d) => a.FcheckResu != null)
                (a, b, c, ca, m, da, z, d, caa, zf) => a.FcheckResu != null)
            //加筛选条件,根据供应商,物料编码,物料名称搜索
            //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
            .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
            (a, b, c, ca, m, da, z, d) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
            (a, b, c, ca, m, da, z, d, caa, zf) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
            || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            .Select((a, b, c, ca, m, da, z,d) => new QsItemOqcReq
            .Select((a, b, c, ca, m, da, z, d, caa, zf) => new QsItemOqcReq
            {
                BillNo = a.BillNo,
                Fsubmit = a.Fsubmit,
@@ -651,6 +653,8 @@
                Daa015 = da.Daa015,
                LineNo = c.LineNo,
                Quantity = m.Quantity,
                Caa015 = caa.Caa015,
                cust = da.Cust == null ? zf.Cust : da.Cust,
                Bgr = d.UserName
            })
            .OrderBy(a => a.CreateDate, OrderByType.Desc)
MES.Service/service/QC/SJService.cs
@@ -3,6 +3,8 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
using System.Data;
using DbType = System.Data.DbType;
namespace MES.Service.service.QC;
@@ -468,4 +470,50 @@
        return withOracle;
    }
    public bool QaSubmit(LLJDto dto)
    {
        try
        {
            // å®šä¹‰è¾“出参数
            var outputResult = new SugarParameter("C_RES", null,
                DbType.Int32, ParameterDirection.Output,
                4000);
            var outputMessage = new SugarParameter("C_MSG", null,DbType.String,
                ParameterDirection.Output, 4000);
            // å®šä¹‰è¾“入参数
            var parameters = new List<SugarParameter>
            {
                new("P_ID", dto.id, DbType.String,
                    ParameterDirection.Input),
                new("P_USER", dto.userNo, DbType.String,
                    ParameterDirection.Input),
                outputResult,
                outputMessage
            };
            var db = SqlSugarHelper.GetInstance();
            // ä½¿ç”¨ SqlSugar æ‰§è¡Œå­˜å‚¨è¿‡ç¨‹
            db.Ado.ExecuteCommand(
                "BEGIN PRC_FPI_OK_GEN_IPI(:P_ID, :P_USER, :C_RES, :C_MSG); END;",
                parameters.ToArray());
            // èŽ·å–è¾“å‡ºå‚æ•°çš„å€¼
            var resultValue = outputResult.Value?.ToString();
            var messageValue = outputMessage.Value?.ToString();
            if ("1".Equals(resultValue)) throw new Exception(messageValue);
            return true;
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }
}
MES.Service/service/QC/XJService.cs
@@ -119,30 +119,32 @@
        return db
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems>((s, a, c, b) =>
                MesItems,Womcaa, ExZzCaaFiled>((s, a, c, b,ca,zf) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
                    JoinType.Left, s.ItemId == b.Id
                    JoinType.Left, s.ItemId == b.Id,
                    JoinType.Left, a.Daa021 == ca.Caa020,
                    JoinType.Left, ca.Erpid == zf.Erpid
                )
            )
            .WhereIF(lineNo != null && lineNo.Length > 0,
                (s, a, c, b) => lineNo.Contains(c.LineNo))
                (s, a, c, b, ca, zf) => lineNo.Contains(c.LineNo))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (s, a, c, b) => s.FcheckResu == null)
                (s, a, c, b, ca, zf) => s.FcheckResu == null)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (s, a, c, b) => s.FcheckResu != null)
            .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
                (s, a, c, b, ca, zf) => s.FcheckResu != null)
            .WhereIF(id > 0, (s, a, c, b, ca, zf) => s.Id == id)
            //加筛选条件,根据供应商,物料编码,物料名称搜索
            //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
            .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
            (s,a,c,b) => (b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
            (s, a, c, b, ca, zf) => (b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
            || b.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .Select((s, a, c, b) => new QsQaItemXj
            .Select((s, a, c, b, ca, zf) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
                Id = s.Id,
@@ -156,6 +158,8 @@
                ItemModel = b.ItemModel,
                FcheckBy = s.FcheckBy,
                FcheckResu = s.FcheckResu,
                Caa015 = ca.Caa015,
                cust = a.Cust == null ? zf.Cust : a.Cust,
                Remarks = s.Remarks
            }).OrderBy(s => s.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
MES.Service/service/WomcaaManager.cs
@@ -125,7 +125,7 @@
            Caa018 = Convert.ToDecimal(dto.planId),
            Caa019 = Convert.ToDecimal(dto.planSeq),
            Caa020 = dto.planNum,
            FMOENTRYID = Convert.ToDecimal(dto.FMOENTRYID)
            Fmoentryid = Convert.ToDecimal(dto.FMOENTRYID)
        };
        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
MESApplication/Controllers/QC/SJController.cs
@@ -63,7 +63,7 @@
    public ResponseResult SetQSItems([FromBody] JObject data)
    {
        var itemNo = data["itemNo"].ToString();
        var lineNo = data["lineNo"].ToString();
        var lineNo = data["lineNo"]?.ToString();
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -320,4 +320,27 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    //QaSubmit
    [HttpPost("qaSubmit")]
    public ResponseResult qaSubmit([FromBody] LLJDto dto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new SJService().QaSubmit(dto);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-03-20T09:58:14.2077893Z||;True|2025-03-15T00:59:39.9999573+08:00||;True|2025-03-07T15:42:21.8276566+08:00||;True|2025-02-27T10:43:45.2314689+08:00||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+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-04-12T04:05:38.9937329Z||;True|2025-04-11T16:26:37.5266569+08:00||;True|2025-03-20T17:58:14.2077893+08:00||;True|2025-03-15T00:59:39.9999573+08:00||;True|2025-03-07T15:42:21.8276566+08:00||;True|2025-02-27T10:43:45.2314689+08:00||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+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>
    <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/Debug/net8.0/log/2025041114.log
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
2025-04-11 14:01:00:726 æŽ¥å£å¼‚常:{"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":"   at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in C:\\Users\\qewqer\\Desktop\\MES\\SG\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n   at lambda_method191(Closure, Object, Object[])\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
2025-04-11 14:01:00:732 å¼‚常提示信息:"Object reference not set to an instance of an object."
==================================================================================================================================
2025-04-11 14:02:16:421 æŽ¥å£å¼‚常:{"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":"   at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in C:\\Users\\qewqer\\Desktop\\MES\\SG\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n   at lambda_method191(Closure, Object, Object[])\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
2025-04-11 14:02:16:422 å¼‚常提示信息:"Object reference not set to an instance of an object."
==================================================================================================================================
2025-04-11 14:03:06:811 æŽ¥å£å¼‚常:{"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":"   at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in C:\\Users\\qewqer\\Desktop\\MES\\SG\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n   at lambda_method191(Closure, Object, Object[])\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n   at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
2025-04-11 14:03:06:811 å¼‚常提示信息:"Object reference not set to an instance of an object."
==================================================================================================================================
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