优化代码格式，添加到货标识和查询条件

啊鑫

2025-06-05 44a7c47a724c154c54e256727c75e79d31fd42e2

优化代码格式，添加到货标识和查询条件

 StandardPda/MES.Service/DB/Repository.cs

@@ -6,11 +6,11 @@
public class Repository<T> : SimpleClient<T> where T : class, new()
{
    protected static SqlSugarScope Db = new(new ConnectionConfig
    {
        DbType = DbType.Oracle,
        ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
        IsAutoCloseConnection = true
    },
        {
            DbType = DbType.Oracle,
            ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
            IsAutoCloseConnection = true
        },
        db =>
        {
            db.Aop.OnLogExecuting = (sql, pars) =>

 StandardPda/MES.Service/DB/RepositoryNoEntity.cs

@@ -6,11 +6,11 @@
public class RepositoryNoEntity
{
    protected static SqlSugarScope Db = new(new ConnectionConfig
    {
        DbType = DbType.Oracle,
        ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
        IsAutoCloseConnection = true
    },
        {
            DbType = DbType.Oracle,
            ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
            IsAutoCloseConnection = true
        },
        db =>
        {
            db.Aop.OnLogExecuting = (sql, pars) =>

 StandardPda/MES.Service/Dto/service/SysSubmit.cs

@@ -1,23 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MES.Service.Dto.service;

namespace MES.Service.Dto.service
public class SysSubmit
{
    public class SysSubmit
    {
        public string? PI_BILLNO { get; set; }
        public string? PI_USER { get; set; }
        public string? PI_SAMPLE_STATUS { get; set; }
        public string? PI_SAMPLE_TYPE { get; set; }
        public string? PI_SAMPLE_REASON { get; set; }
        public string? PI_INSPECT_TYPE { get; set; }
        public string? PI_SAMPLE_PREPARATION { get; set; }
        public string? PI_URGENCY { get; set; }
        public string? PI_FIRMWAREVERSION { get; set; }
        public string? PI_HARDWAREVERSION { get; set; }
        public string? PI_REMARK { get; set; }
    }
}
    public string? PI_BILLNO { get; set; }
    public string? PI_USER { get; set; }
    public string? PI_SAMPLE_STATUS { get; set; }
    public string? PI_SAMPLE_TYPE { get; set; }
    public string? PI_SAMPLE_REASON { get; set; }
    public string? PI_INSPECT_TYPE { get; set; }
    public string? PI_SAMPLE_PREPARATION { get; set; }
    public string? PI_URGENCY { get; set; }
    public string? PI_FIRMWAREVERSION { get; set; }
    public string? PI_HARDWAREVERSION { get; set; }
    public string? PI_REMARK { get; set; }
}

 StandardPda/MES.Service/Dto/service/XJPageResult.cs

@@ -18,21 +18,26 @@
    ///     下拉框搜索条件
    /// </summary>
    public string? SelectedIndex { get; set; }

    /// <summary>
    ///   搜全部，或者当前用户（默认0，当前用户，1：全部）
    ///     搜全部，或者当前用户（默认0，当前用户，1：全部）
    /// </summary>
    public string? UserIndex { get; set; }

    /// <summary>
    ///  开始时间
    ///     开始时间
    /// </summary>
    public string? startDate { get; set; }

    /// <summary>
    ///  结束时间
    ///     结束时间
    /// </summary>
    public string? endDate { get; set; }

    /// <summary>
    ///  状态（合格 or 不合格）
    ///     状态（合格 or 不合格）
    /// </summary>
    public string? state { get; set; }

    
    public int? arrivalFilter { get; set; }
}

 StandardPda/MES.Service/Dto/webApi/ErpItems.cs

@@ -39,12 +39,14 @@
    public string? PrivateDescSeg11 { get; set; }
    public string? PrivateDescSeg7 { get; set; }
    public string? PrivateDescSeg2 { get; set; }

    /// <summary>
    /// 采购员
    ///     采购员
    /// </summary>
    public string? Merchandiser { get; set; }

    /// <summary>
    /// 仓管员
    ///     仓管员
    /// </summary>
    public string? WarehouseKeeper { get; set; }
}

 StandardPda/MES.Service/MES.Service.csproj

@@ -7,9 +7,9 @@
    </PropertyGroup>

    <ItemGroup>
        <PackageReference Include="Masuit.Tools.Core" Version="2024.3.4" />
        <PackageReference Include="RestSharp" Version="112.1.0" />
        <PackageReference Include="SqlSugarCore" Version="5.1.4.158" />
        <PackageReference Include="Masuit.Tools.Core" Version="2024.3.4"/>
        <PackageReference Include="RestSharp" Version="112.1.0"/>
        <PackageReference Include="SqlSugarCore" Version="5.1.4.158"/>
    </ItemGroup>

</Project>

 StandardPda/MES.Service/Modes/InspectorChangeLog.cs

@@ -1,42 +1,46 @@
using SqlSugar;

namespace MES.Service.Modes
namespace MES.Service.Modes;

[SugarTable("INSPECTOR_CHANGE_LOG")]
public class InspectorChangeLog
{
    [SugarTable("INSPECTOR_CHANGE_LOG")]
    public class InspectorChangeLog
    {
        /// <summary>
        /// 主键，唯一标识
        /// </summary>
        [SugarColumn(ColumnName = "CHANGE_ID", IsPrimaryKey = true, IsIdentity = true)]
        public long ChangeId { get; set; }
        /// <summary>
        /// 检验单号
        /// </summary>
        [SugarColumn(ColumnName = "INSPECTION_NO", Length = 50, IsNullable = false)]
        public string? InspectionNo { get; set; }
        /// <summary>
        /// 检验员
        /// </summary>
        [SugarColumn(ColumnName = "INSPECTOR", Length = 50, IsNullable = false)]
        public string? Inspector { get; set; }
    /// <summary>
    ///     主键，唯一标识
    /// </summary>
    [SugarColumn(ColumnName = "CHANGE_ID", IsPrimaryKey = true,
        IsIdentity = true)]
    public long ChangeId { get; set; }

        /// <summary>
        /// 修改时间（默认当前时间）
        /// </summary>
    /// <summary>
    ///     检验单号
    /// </summary>
    [SugarColumn(ColumnName = "INSPECTION_NO", Length = 50, IsNullable = false)]
    public string? InspectionNo { get; set; }

        [SugarColumn(ColumnName = "CHANGE_TIME", DefaultValue = "SYSDATE")]
        public DateTime? ChangeTime { get; set; }
        /// <summary>
        /// 修改人
        /// </summary>
    /// <summary>
    ///     检验员
    /// </summary>
    [SugarColumn(ColumnName = "INSPECTOR", Length = 50, IsNullable = false)]
    public string? Inspector { get; set; }

        [SugarColumn(ColumnName = "CHANGED_BY", Length = 50, IsNullable = false)]
        public string? ChangedBy { get; set; }
        /// <summary>
        /// 是否有效（Y:有效 N：无效）
        /// </summary>
        [SugarColumn(ColumnName = "IS_VALID", DefaultValue = "Y", Length = 1)]
        public string? IsValid { get; set; }
    }
}
    /// <summary>
    ///     修改时间（默认当前时间）
    /// </summary>

    [SugarColumn(ColumnName = "CHANGE_TIME", DefaultValue = "SYSDATE")]
    public DateTime? ChangeTime { get; set; }

    /// <summary>
    ///     修改人
    /// </summary>

    [SugarColumn(ColumnName = "CHANGED_BY", Length = 50, IsNullable = false)]
    public string? ChangedBy { get; set; }

    /// <summary>
    ///     是否有效（Y:有效 N：无效）
    /// </summary>
    [SugarColumn(ColumnName = "IS_VALID", DefaultValue = "Y", Length = 1)]
    public string? IsValid { get; set; }
}

 StandardPda/MES.Service/Modes/LtsLlj.cs

@@ -176,21 +176,30 @@
    /// </summary>
    [SugarColumn(ColumnName = "JYCS")]
    public int JYCS { get; set; }

    /// <summary>
    ///   技改状态
    ///     技改状态
    /// </summary>
    [SugarColumn(ColumnName = "EXTEND_N01")]
    public string? ExtendNo1 { get; set; }

    /// <summary>
    ///   往期检验履历
    ///     往期检验履历
    /// </summary>
    [SugarColumn(ColumnName = "LVLI")]
    public string? LVLI { get; set; }

    /// <summary>
    ///   最大抽检数量
    ///     最大抽检数量
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_QYT")]
    public string? MaxCheckQyt { get; set; }

    /// <summary>
    ///     是否到货
    /// </summary>
    [SugarColumn(ColumnName = "IS_ARRIVAL")]
    public int? IsArrival { get; set; }

    [SugarColumn(IsIgnore = true)] public string? UserName { get; set; }

@@ -211,6 +220,7 @@
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? NewFngDesc { get; set; }

    /// <summary>
    ///     项目
    /// </summary>

 StandardPda/MES.Service/Modes/MesItems.cs

@@ -522,14 +522,15 @@
    /// </summary>
    [SugarColumn(ColumnName = "Old_ITEM_NO")]
    public string? OldItemNo { get; set; }

    /// <summary>
    /// 采购业务员
    ///     采购业务员
    /// </summary>
    [SugarColumn(ColumnName = "MERCHANDISER")]
    public string? Merchandiser { get; set; }

    /// <summary>
    /// 仓管员
    ///     仓管员
    /// </summary>
    [SugarColumn(ColumnName = "WAREHOUSEKEEPER")]
    public string? WarehouseKeeper { get; set; }

 StandardPda/MES.Service/Modes/MesQa.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/MesQaIqc.cs

@@ -72,8 +72,9 @@
    /// <summary>
    ///     项次编号
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_ID")]  // 缺失字段需要添加
    [SugarColumn(ColumnName = "ITEM_ID")] // 缺失字段需要添加
    public string? ItemId { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "ISENABLED")]

 StandardPda/MES.Service/Modes/MesQaItemsDetect02.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs

@@ -155,9 +155,9 @@
    public byte? GivenModify { get; set; }

    /// <summary>
    /// 检验工具
    ///     检验工具
    /// </summary>
    [SugarColumn(ColumnName = "FCHECK_TOOL", Length = 100)]  // 明确长度限制
    [SugarColumn(ColumnName = "FCHECK_TOOL", Length = 100)] // 明确长度限制
    public string? FcheckTool { get; set; }

    /// <summary>

 StandardPda/MES.Service/Modes/MesQsImage.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/MesQsSuspend.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/MesQualityStandard.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsItemIpiItem.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsItemIpiItemDetail.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsItemIpiReq.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsItemOqcItem.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsItemOqcItemDetail.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsItemOqcReq.cs

@@ -1,5 +1,5 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsQaItemXj.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsQaItemXj01.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/QsQaItemXj02.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/SysUser.cs

@@ -1,6 +1,6 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;


 StandardPda/MES.Service/Modes/Womcaa.cs

@@ -11,7 +11,8 @@
    /// <summary>
    ///     自增列 SEQ_CAA
    /// </summary>
    [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_CAA", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAA",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>

 StandardPda/MES.Service/Modes/Womcab.cs

@@ -11,7 +11,8 @@
    /// <summary>
    ///     自增列
    /// </summary>
    [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_CAB", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAB",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
@@ -202,32 +203,32 @@


    /// <summary>
    /// 应发数量
    ///     应发数量
    /// </summary>
    [SugarColumn(ColumnName = "MUST_QTY", ColumnDataType = "NUMBER(18,3)")]
    public decimal? MustQty { get; set; }

    /// <summary>
    /// 用料清单状态（A-创建，B-审核中，C-已审核，D-重新审核，Z-暂存）
    ///     用料清单状态（A-创建，B-审核中，C-已审核，D-重新审核，Z-暂存）
    /// </summary>
    [SugarColumn(ColumnName = "TYPEB", Length = 2)]
    public string? TypeB { get; set; }


    /// <summary>
    /// 子项类型（1-标准件 2-返还件 3-替代件）
    ///     子项类型（1-标准件 2-返还件 3-替代件）
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_TYPE", Length = 1)]
    public string? MaterialType { get; set; }

    /// <summary>
    /// 使用比例（%）
    ///     使用比例（%）
    /// </summary>
    [SugarColumn(ColumnName = "USE_RATE", ColumnDataType = "NUMBER(5,2)")]
    public decimal? UseRate { get; set; }

    /// <summary>
    /// 项次
    ///     项次
    /// </summary>
    [SugarColumn(ColumnName = "FREPLACEGROUP", ColumnDataType = "NUMBER(5,2)")]
    public decimal? FreplaceGroup { get; set; }

 StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs

@@ -45,8 +45,8 @@
        EmployeeInfo entityEmployeeInfo,
        List<EmployeeItem> entityEmployeeItems)
    {
        db.Deleteable<EmployeeInfo>().Where(
            s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
        db.Deleteable<EmployeeInfo>().Where(s => s.Id == entityEmployeeInfo.Id)
            .ExecuteCommand();

        db.Deleteable<EmployeeItem>()
            .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
@@ -63,8 +63,8 @@
        EmployeeInfo entityEmployeeInfo,
        List<EmployeeItem> entityEmployeeItems)
    {
        var command = db.Deleteable<EmployeeInfo>().Where(
            s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
        var command = db.Deleteable<EmployeeInfo>()
            .Where(s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();

        var executeCommand = db.Deleteable<EmployeeItem>()
            .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();

 StandardPda/MES.Service/service/BasicData/MesItemsManager.cs

@@ -148,9 +148,8 @@
                CreateDate = DateTime.Now,
                Company = "1000",
                Factory = "1000",
                WarehouseKeeper=item.WarehouseKeeper,
                Merchandiser=item.Merchandiser

                WarehouseKeeper = item.WarehouseKeeper,
                Merchandiser = item.Merchandiser
            };
            list.Add(items);
        }

 StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs

@@ -1,8 +1,8 @@
using MES.Service.DB;
using System.Globalization;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using System.Globalization;

namespace MES.Service.service.BasicData;


 StandardPda/MES.Service/service/LoginService.cs

@@ -1,6 +1,6 @@
using MES.Service.DB;
using System.Data;
using System.Data;
using System.Text;
using MES.Service.DB;

namespace MES.Service.service;


 StandardPda/MES.Service/service/QC/BaseService.cs

@@ -51,12 +51,14 @@
        });
        return mesQsImages;
    }

    public List<MesQsImage> getLljAllImgByFid(string id, string qsType)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesQsImages = db.Queryable<MesQsImage,MesQaItemsDetectDetail5>((a,b)=>
        new JoinQueryInfos(JoinType.Left,a.Fid==b.Id))
            .Where((a,b)=> b.ReleaseNo == id && a.Id != null).ToList();
        var mesQsImages = db
            .Queryable<MesQsImage, MesQaItemsDetectDetail5>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Fid == b.Id))
            .Where((a, b) => b.ReleaseNo == id && a.Id != null).ToList();
        mesQsImages.ForEach(s =>
        {
            if (s.ImageData is { Length: > 0 })

 StandardPda/MES.Service/service/QC/LljService.cs

@@ -1,23 +1,14 @@
using Masuit.Tools;
using System.Data;
using System.Security.Cryptography;
using System.Text;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using MySqlConnector;
using Newtonsoft.Json;
using RestSharp;
using SharpCompress.Factories;
using SqlSugar;
using System.ComponentModel;
using System.Data;
using System.Xml.Linq;
using ZstdSharp.Unsafe;
using System.Net.Http;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using DbType = System.Data.DbType;
using System.Text;
using System.Security.Cryptography;
using AngleSharp.Io;


namespace MES.Service.service.QC;
@@ -40,14 +31,16 @@

        var pageList = db
            .Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser,
                IqcBeforeFrom, SysUser, InspectorChangeLog, SysUser>((a, b, d, e, f, g,h,i) =>
                IqcBeforeFrom, SysUser, InspectorChangeLog, SysUser>((a, b, d,
                    e, f, g, h, i) =>
                new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
                    JoinType.Inner, a.Id == d.Id,
                    JoinType.Left, a.CreateBy == e.Fcode,
                    JoinType.Left, f.Id == b.PID,
                    JoinType.Left, f.Sid == g.Fid,
                    JoinType.Left,a.ReleaseNo==h.InspectionNo && h.IsValid=="Y",
                    JoinType.Left,i.Fcode==h.Inspector
                    JoinType.Left,
                    a.ReleaseNo == h.InspectionNo && h.IsValid == "Y",
                    JoinType.Left, i.Fcode == h.Inspector
                ))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -61,6 +54,7 @@
            //    itemIds is { Length: > 0 },
            //    (a, b, c) => itemIds.Contains(a.ItemId))
            .WhereIF(id > 0, (a, b, d) => a.Id == id)
            .WhereIF(queryObj.arrivalFilter >= 0, (a, b, d) => a.IsArrival == queryObj.arrivalFilter)
            .WhereIF(queryObj.createUser!="PL017"&& queryObj.UserIndex=="0", (a, b, d, e, f, g,h, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser))//判断此单的检验员，或者检验为空就显示此单据
            //加筛选条件,根据供应商，物料编码，物料名称，项目搜索
            //.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
@@ -79,11 +73,11 @@
            .WhereIF(queryObj.result == "已完成" && queryObj.state!= "所有状态",(a, b, d, e) => (a.FcheckResu == queryObj.state))
            // .WhereIF(queryObj.result == "未完成" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
            //.OrderByDescending((a, b, d) => a.Id)
            .Select((a, b, d, e, f, g,h,i) => new LtsLlj
            .Select((a, b, d, e, f, g, h, i) => new LtsLlj
            {
                //UserName = g.Fname,
                //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
                UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
                UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
                FIRST = d.First,
                CreateUserName = e.Fname,
                NewFngDesc = d.NewFngDesc,
@@ -214,7 +208,7 @@


    /// <summary>
    /// 调用存储过程，重新获取检验项目
    ///     调用存储过程，重新获取检验项目
    /// </summary>
    /// <param name="itemNo"></param>
    /// <param name="quantity"></param>
@@ -236,9 +230,9 @@
        var parameters = new List<SugarParameter>
        {
            new("P_RELEASE_NO", releaseNo,
          DbType.String, ParameterDirection.Input),
      outputResult,
      outputMessage
                DbType.String, ParameterDirection.Input),
            outputResult,
            outputMessage
        };

        var db = SqlSugarHelper.GetInstance();
@@ -251,24 +245,22 @@
        // 获取输出参数的值
        var resultValue = outputResult.Value?.ToString();
        var messageValue = outputMessage.Value?.ToString();
        string[] msg = new string[2];
        var msg = new string[2];
        msg[0] = resultValue;
        msg[1] = messageValue;
        return msg;

    }




    /// <summary>
    /// 保存新检验员
    ///     保存新检验员
    /// </summary>
    /// <param name="NewStaffUserID">新检验员ID</param>
    /// <param name="userID">修改人</param>
    /// <param name="releaseNo">检验单号</param>
    /// <returns></returns>
    public string[] SaveCheckBy(string NewStaffUserID, string userID, string releaseNo)
    public string[] SaveCheckBy(string NewStaffUserID, string userID,
        string releaseNo)
    {
        // 定义输出参数
        var outputResult = new SugarParameter("o_Result", null,
@@ -283,14 +275,14 @@
        var parameters = new List<SugarParameter>
        {
            new("P_FCHECK_BY", NewStaffUserID,
          DbType.String, ParameterDirection.Input),
              new("p_Release_No", releaseNo,
          DbType.String, ParameterDirection.Input),
                DbType.String, ParameterDirection.Input),
            new("p_Release_No", releaseNo,
                DbType.String, ParameterDirection.Input),
            new("p_User", userID,
          DbType.String, ParameterDirection.Input),
          
      outputResult,
      outputMessage
                DbType.String, ParameterDirection.Input),

            outputResult,
            outputMessage
        };

        var db = SqlSugarHelper.GetInstance();
@@ -303,13 +295,11 @@
        // 获取输出参数的值
        var resultValue = outputResult.Value?.ToString();
        var messageValue = outputMessage.Value?.ToString();
        string[] msg = new string[2];
        var msg = new string[2];
        msg[0] = resultValue;
        msg[1] = messageValue;
        return msg;

    }



    public string[] SaveSysSubmit(SysSubmit sysSubmit)
@@ -327,30 +317,30 @@
        var parameters = new List<SugarParameter>
        {
            new("PI_BILLNO", sysSubmit.PI_BILLNO,
          DbType.String, ParameterDirection.Input),
             new("PI_USER", sysSubmit.PI_USER,
          DbType.String, ParameterDirection.Input),
              new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
          DbType.String, ParameterDirection.Input),
               new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
          DbType.String, ParameterDirection.Input),
                new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
          DbType.String, ParameterDirection.Input),
                 new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
          DbType.String, ParameterDirection.Input),
                  new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
          DbType.String, ParameterDirection.Input),
                   new("PI_URGENCY", sysSubmit.PI_URGENCY,
          DbType.String, ParameterDirection.Input),
                    new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
          DbType.String, ParameterDirection.Input),
                     new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
          DbType.String, ParameterDirection.Input),
                      new("PI_REMARK", sysSubmit.PI_REMARK,
          DbType.String, ParameterDirection.Input),
                DbType.String, ParameterDirection.Input),
            new("PI_USER", sysSubmit.PI_USER,
                DbType.String, ParameterDirection.Input),
            new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
                DbType.String, ParameterDirection.Input),
            new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
                DbType.String, ParameterDirection.Input),
            new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
                DbType.String, ParameterDirection.Input),
            new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
                DbType.String, ParameterDirection.Input),
            new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
                DbType.String, ParameterDirection.Input),
            new("PI_URGENCY", sysSubmit.PI_URGENCY,
                DbType.String, ParameterDirection.Input),
            new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
                DbType.String, ParameterDirection.Input),
            new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
                DbType.String, ParameterDirection.Input),
            new("PI_REMARK", sysSubmit.PI_REMARK,
                DbType.String, ParameterDirection.Input),
            outputResult,
            outputMessage
  };
        };

        var db = SqlSugarHelper.GetInstance();

@@ -362,56 +352,18 @@
        // 获取输出参数的值
        var resultValue = outputResult.Value?.ToString();
        var messageValue = outputMessage.Value?.ToString();
        string[] msg = new string[2];
        var msg = new string[2];
        msg[0] = resultValue;
        msg[1] = messageValue;
        return msg;

    }


    public class DataAcquisitionConfiguration
    {
        //测试环境
        public const string TEST_COMPANY_CODE = "55958795";
        public const string TEST_APP_KEY = "ab2d86b6dffabcc81dca6855c727c246";
        public const string TEST_APP_SECRET = "01b17babe2a96d5ebd802e67709f33d1";
        public const string TEST_ERP_CODE = "Z106";

        //正式环境
        public const string COMPANY_CODE = "72505985";
        public const string APP_KEY = "a2866f03bb7f76387bfb1a98001f0e31";
        public const string APP_SECRET = "f13bd1bcb130f0090ed92dc021e5f4e1";
        public const string ERP_CODE = "Z106";
    }
    [Serializable]
    public class ApiCommonParam
    {
        //发放给用户的Key
        public string appKey { get; set; }
        //接口版本
        public string version { get; set; }
        //数据所属公司编码
        public string ownerCompanyCode { get; set; }
        //操作者所属公司编码
        public string operateCompanyCode { get; set; }
        //签名
        public string sign { get; set; }
        //时间戳
        public long? timestamps { get; set; }
        ////扩展字段
        //public object Reserver { get; set; }
    }
    [Serializable]
    public class BodyParam
    {
        public string erpCode { get; set; }
        public string dnXkNo { get; set; }
    }
    public static string BuildCurrentSign(string paramJson, string appSecret)
    {
        var commonDict = new Dictionary<string, string>();
        var jsonDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(paramJson);
        var jsonDict =
            JsonConvert
                .DeserializeObject<Dictionary<string, object>>(paramJson);

        var keyList = new List<string>();
        foreach (var entry in jsonDict)
@@ -429,60 +381,21 @@

        // 拼接签名字符串
        var sb = new StringBuilder();
        foreach (var key in keyList)
        {
            sb.Append(commonDict[key]).Append(":");
        }
        foreach (var key in keyList) sb.Append(commonDict[key]).Append(":");
        sb.Append(appSecret);

        // 计算MD5
        using var md5 = MD5.Create();
        byte[] hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(sb.ToString()));
        var hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(sb.ToString()));

        return BitConverter.ToString(hashBytes)
                          .Replace("-", "")
                          .ToLowerInvariant();
    }
    public class XkyCommonParam
    {
        public ApiCommonParam commonParam { get; set; }
        public BodyParam body { get; set; }

        public static XkyCommonParam GetInit()
        {
            var apiParam = new ApiCommonParam
            {
                // 发携客云提供的appKey
                appKey = DataAcquisitionConfiguration.APP_KEY,
                // 接口版本
                version = "1.0",
                // 操作者所属公司编码
                operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
                // 数据所属公司编码，非集团公司默认赋值为操作公司
                ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
                // 当前时间对应的时间戳（秒数）
                timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            };
            

            string appSecret = DataAcquisitionConfiguration.APP_SECRET;

            // 生成签名
            string sign = BuildCurrentSign(
                JsonConvert.SerializeObject(apiParam),
                appSecret);
            apiParam.sign = sign;

            return new XkyCommonParam
            {
                commonParam = apiParam
            };
        }
            .Replace("-", "")
            .ToLowerInvariant();
    }

    public async Task<string[]> SignDelivery(string id)
    {
        string[] msg = new string[2];
        var msg = new string[2];
        //发起请求，签收送货单

        try
@@ -495,27 +408,30 @@
            };

            // 序列化为JSON
            string json = JsonConvert.SerializeObject(requestData);
            var json = JsonConvert.SerializeObject(requestData);

        using (var client = new HttpClient())
        {
            // 设置请求内容
            var content = new StringContent(json, Encoding.UTF8, "application/json");
            // 发送POST请求
            HttpResponseMessage response = await client.PostAsync(
                "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json",
                content);
            // 处理响应
            if (response.IsSuccessStatusCode)
            using (var client = new HttpClient())
            {
                string responseBody = await response.Content.ReadAsStringAsync();
                // 设置请求内容
                var content = new StringContent(json, Encoding.UTF8,
                    "application/json");
                // 发送POST请求
                var response = await client.PostAsync(
                    "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json",
                    content);
                // 处理响应
                if (response.IsSuccessStatusCode)
                {
                    var responseBody =
                        await response.Content.ReadAsStringAsync();
                    var result =
                   JsonConvert.DeserializeObject<XKYApiResponse>(responseBody);
                        JsonConvert.DeserializeObject<XKYApiResponse>(
                            responseBody);
                    //成功后手动下推到货单
                    if (result.Result == 1) {

                    if (result.Result == 1)
                    {
                        // 定义输出参数
                        

                        var outputMessage = new SugarParameter("C_RESULT", null,
                            DbType.String,
                            ParameterDirection.Output, 4000);
@@ -523,8 +439,8 @@
                        // 定义输入参数
                        var parameters = new List<SugarParameter>
                        {
                            new("C_IN_STR", "送货单签收[BTNOK[PL017["+id,
                          DbType.String, ParameterDirection.Input),
                            new("C_IN_STR", "送货单签收[BTNOK[PL017[" + id,
                                DbType.String, ParameterDirection.Input),
                            outputMessage
                        };

@@ -537,7 +453,7 @@


                        // 获取输出参数的值
                       

                        var messageValue = outputMessage.Value?.ToString();

                        msg[0] = "0";
@@ -545,21 +461,22 @@
                    }
                    else
                    {
                        if (result.ErrorMsg== "出货单据不是已送货状态！")
                        if (result.ErrorMsg == "出货单据不是已送货状态！")
                        {
                            // 定义输出参数

                            var outputMessage = new SugarParameter("C_RESULT", null,
                            var outputMessage = new SugarParameter("C_RESULT",
                                null,
                                DbType.String,
                                ParameterDirection.Output, 4000);

                            // 定义输入参数
                            var parameters = new List<SugarParameter>
                        {
                            new("C_IN_STR", "送货单签收[BTNOK[PL017["+id,
                          DbType.String, ParameterDirection.Input),
                            outputMessage
                        };
                            {
                                new("C_IN_STR", "送货单签收[BTNOK[PL017[" + id,
                                    DbType.String, ParameterDirection.Input),
                                outputMessage
                            };

                            var db = SqlSugarHelper.GetInstance();

@@ -581,21 +498,17 @@
                            msg[0] = "1";
                            msg[1] = "002[" + id + "签收失败，" + result.ErrorMsg;
                        }
                     
                    }
                   
                }
            else
            {
                 
                else
                {
                    msg[0] = "1";
                    msg[1] = $"002[{id}签收失败，请求失败，状态码：{response.StatusCode}";
                }
            }
        }
    }
        catch (Exception ex)
        {
            
            msg[0] = "1";
            msg[1] = $"002[请求失败，状态码：{ex.Message}";
        }
@@ -604,9 +517,7 @@
        //msg[0] = "1";
        //msg[1] = responseBody; 
        return msg;

    }



    private string ExtractSubstring(string input, char startChar, char endChar)
@@ -679,9 +590,10 @@
    {
        var db = SqlSugarHelper.GetInstance();

        return db.Queryable<MesQaItemsDetectDetail5, MesQaItemsDetectDetail12>(
                (a, b) =>
                    new JoinQueryInfos(JoinType.Left, a.Id == b.MainId))
        return db
            .Queryable<MesQaItemsDetectDetail5,
                MesQaItemsDetectDetail12>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.MainId))
            .Where((a, b) => a.ReleaseNo == releaseNo)
            // .WhereIF(id > 0, (a, b) => a.Id == id)
            .OrderByDescending((a, b) => a.FcheckItem)
@@ -726,12 +638,12 @@
    }



    public DataTable getAllInspectors()
    {
         OracleSQLHelper SQLHelper = new();
         var sql =string.Format(@"select a.USER_NAME label,U.FCODE value from IQC_BEFORE_FROM a JOIN SYS_USER U ON U.FID=A.SID");
         return SQLHelper.ExecuteQuery(sql);
        OracleSQLHelper SQLHelper = new();
        var sql =
            @"select a.USER_NAME label,U.FCODE value from IQC_BEFORE_FROM a JOIN SYS_USER U ON U.FID=A.SID";
        return SQLHelper.ExecuteQuery(sql);
    }


@@ -800,8 +712,8 @@
        //    result = "不合格";
        else if (noCount >= QsItemOqcItem.FreQty)
            result = "不合格";
        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<MesQaItemsDetectDetail5>()
@@ -942,71 +854,71 @@
    public DataTable getFromInfo(string BarCode)
    {
        OracleSQLHelper SQLHelper = new();
        var sql = string.Format(@"select b.ID,b.LOT_NO,b.RELEASE_NO,b.FSUBMIT from MES_INV_ITEM_BARCODES A
        var sql = string.Format(
            @"select b.ID,b.LOT_NO,b.RELEASE_NO,b.FSUBMIT from MES_INV_ITEM_BARCODES A
                                    left join MES_QA_ITEMS_DETECT_01 B on A.BILL_NO=b.LOT_NO and A.ITEM_ID=b.ITEM_ID
                                    where ITEM_BARCODE='"+ BarCode + "'");
                                    where ITEM_BARCODE='" + BarCode + "'");
        return SQLHelper.ExecuteQuery(sql);
    }

    public DataTable getImgBDlist(string id)
    {
        OracleSQLHelper SQLHelper = new();
        var sql = string.Format(@"select id,FID,IMAGE_DATA from MES_QS_IMAGE where FID="+id+"");
        var sql =
            string.Format(
                @"select id,FID,IMAGE_DATA from MES_QS_IMAGE where FID=" + id +
                "");
        return SQLHelper.ExecuteQuery(sql);
    }
    /// <summary>
    /// 一致性项目
    /// </summary>
    public class Component
    {
        public string Name { get; set; }
        public List<string> Specs { get; set; }
        public List<string> Manufacturers { get; set; }
        public List<string> Id { get; set; }
        public int SelectedSpec { get; set; }
        public int SelectedMfg { get; set; }
    }

    public List<Component> getYzxBDlist(string id)
    {
        OracleSQLHelper SQLHelper = new();
        //查元器件
        var sql1 = string.Format(@"select ITEMNAME from MES_IQC_CONSISTENCY_ck where PID='"+id+"' group by ITEMNAME order by ITEMNAME");
        var sql1 =
            string.Format(
                @"select ITEMNAME from MES_IQC_CONSISTENCY_ck where PID='" +
                id + "' group by ITEMNAME order by ITEMNAME");
        //查明细
        var sql2 = string.Format(@"select * from MES_IQC_CONSISTENCY_ck where PID='"+id+"' order by ITEMNAME,ITEMMODE,SUPPNAME");
        DataTable dataTable1= SQLHelper.ExecuteQuery(sql1);
        DataTable dataTable2 = SQLHelper.ExecuteQuery(sql2);
        List<Component> Components = new List<Component>();
        var sql2 =
            string.Format(@"select * from MES_IQC_CONSISTENCY_ck where PID='" +
                          id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
        var dataTable1 = SQLHelper.ExecuteQuery(sql1);
        var dataTable2 = SQLHelper.ExecuteQuery(sql2);
        var Components = new List<Component>();



        for (int i = 0; i <dataTable1.Rows.Count; i++)
        for (var i = 0; i < dataTable1.Rows.Count; i++)
        {
            Component component = new Component();
            component.Name= dataTable1.Rows[i]["ITEMNAME"].ToString();
            component.Specs= new List<string>();
            var component = new Component();
            component.Name = dataTable1.Rows[i]["ITEMNAME"].ToString();
            component.Specs = new List<string>();
            component.Manufacturers = new List<string>();
            component.Id = new List<string>();
            component.SelectedSpec = -1;
            component.SelectedMfg = -1;
            int index = 0;
            for (int j = 0; j < dataTable2.Rows.Count; j++)
            {
                
                if (dataTable2.Rows[j]["ITEMNAME"].ToString()== dataTable1.Rows[i]["ITEMNAME"].ToString())
            var index = 0;
            for (var j = 0; j < dataTable2.Rows.Count; j++)
                if (dataTable2.Rows[j]["ITEMNAME"].ToString() ==
                    dataTable1.Rows[i]["ITEMNAME"].ToString())
                {
                    component.Specs.Add(dataTable2.Rows[j]["ITEMMODE"].ToString());
                    component.Manufacturers.Add(dataTable2.Rows[j]["SUPPNAME"].ToString());
                    component.Specs.Add(dataTable2.Rows[j]["ITEMMODE"]
                        .ToString());
                    component.Manufacturers.Add(dataTable2.Rows[j]["SUPPNAME"]
                        .ToString());
                    component.Id.Add(dataTable2.Rows[j]["ID"].ToString());
                    if (dataTable2.Rows[j]["ISCHACK"].ToString()=="1")
                    if (dataTable2.Rows[j]["ISCHACK"].ToString() == "1")
                    {
                        component.SelectedSpec = index;
                        component.SelectedMfg = index;
                    }

                    index++;
                }
            }

            Components.Add(component);
        }

        return Components;
    }

@@ -1014,66 +926,73 @@
    {
        OracleSQLHelper SQLHelper = new();
        //查不良描述
        var sql1 = string.Format(@"select DEFECT_NAME
        var sql1 = @"select DEFECT_NAME
                                    from MES_DEFECT_CODE A
                                    left join MES_DEFECT_TYPE X ON X.TYPE_NO = A.DEFECT_SORT AND X.COMPANY = A.COMPANY AND X.FACTORY = A.FACTORY");
      
                                    left join MES_DEFECT_TYPE X ON X.TYPE_NO = A.DEFECT_SORT AND X.COMPANY = A.COMPANY AND X.FACTORY = A.FACTORY";

        return SQLHelper.ExecuteQuery(sql1);
    }

    public DataTable getBlmsItem(string id)
    {
        OracleSQLHelper SQLHelper = new();
        //查不良描述
        var sql1 = string.Format(@"select FCHECK_ITEM,FUNIT from mes_qa_items_detect_detail5 f where RELEASE_NO='"+id+"' and FUNIT is not null order by FCHECK_ITEM");
        var sql1 = string.Format(
            @"select FCHECK_ITEM,FUNIT from mes_qa_items_detect_detail5 f where RELEASE_NO='" +
            id + "' and FUNIT is not null order by FCHECK_ITEM");

        return SQLHelper.ExecuteQuery(sql1);
    }
    public void saveYzxBDlist(string id,DataTable DB)

    public void saveYzxBDlist(string id, DataTable DB)
    {
        OracleSQLHelper SQLHelper = new();
        //先把结果清空
        var sql1 = string.Format(@"update MES_IQC_CONSISTENCY_ck set ISCHACK=0 where PID='"+ id + "' ");
        var sql1 =
            string.Format(
                @"update MES_IQC_CONSISTENCY_ck set ISCHACK=0 where PID='" +
                id + "' ");
        SQLHelper.ExecuteQuery(sql1);
        string rowId = "";
        for (int i = 0; i < DB.Rows.Count; i++)
        {
        var rowId = "";
        for (var i = 0; i < DB.Rows.Count; i++)
            rowId += "'" + DB.Rows[i]["id"] + "',";
        }
        rowId = rowId.Substring(0, rowId.Length - 1);


        //修改结果
        var sql2 = string.Format(@"update MES_IQC_CONSISTENCY_ck set ISCHACK=1 where PID='" + id + "'and id in("+ rowId + ") ");
        var sql2 =
            string.Format(
                @"update MES_IQC_CONSISTENCY_ck set ISCHACK=1 where PID='" +
                id + "'and id in(" + rowId + ") ");
        SQLHelper.ExecuteQuery(sql2);

    }

    public string[] YzxImgVerify(string id)
    {
        string[] msgStr = new string[2];
        
        var msgStr = new string[2];

        OracleSQLHelper SQLHelper = new();
        //修改结果
        var sql2 = string.Format(@"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='"+ id + "' group by  ITEMNAME) A " +
        var sql2 = string.Format(
            @"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='" +
            id + "' group by  ITEMNAME) A " +
            "left join MES_QS_IMAGE b on a.id=b.fid where B.id is null order by ITEMNAME");
        DataTable db= SQLHelper.ExecuteQuery(sql2);
        var db = SQLHelper.ExecuteQuery(sql2);
        if (db.Rows.Count > 0)
        {
            msgStr[1] = "元器件：";
            for (int i = 0; i < db.Rows.Count; i++)
            {
                msgStr[1] += db.Rows[i]["ITEMNAME"]+ ",";
            }
            for (var i = 0; i < db.Rows.Count; i++)
                msgStr[1] += db.Rows[i]["ITEMNAME"] + ",";
            msgStr[1] += "未完成图片上传，请上传！";
            msgStr[0] = "1";
        }
        else 
        else
        {
            msgStr[0] = "0";
            msgStr[1] = "ok";
        }

    return msgStr;
        return msgStr;
    }

    public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail)
@@ -1142,8 +1061,8 @@
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetectDetail5>()
                 .SetColumns(it =>
                     it.Funit == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .SetColumns(it =>
                    it.Funit == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
        });
@@ -1212,11 +1131,10 @@
            // 获取输出参数的值
            var resultValue = outputResult.Value?.ToString();
            var messageValue = outputMessage.Value?.ToString();
            string[] msg = new string[2];
            var msg = new string[2];
            msg[0] = resultValue;
            msg[1] = messageValue;
            return msg;
             
        }
        catch (Exception ex)
        {
@@ -1253,6 +1171,106 @@
        }
    }


    public class DataAcquisitionConfiguration
    {
        //测试环境
        public const string TEST_COMPANY_CODE = "55958795";
        public const string TEST_APP_KEY = "ab2d86b6dffabcc81dca6855c727c246";

        public const string TEST_APP_SECRET =
            "01b17babe2a96d5ebd802e67709f33d1";

        public const string TEST_ERP_CODE = "Z106";

        //正式环境
        public const string COMPANY_CODE = "72505985";
        public const string APP_KEY = "a2866f03bb7f76387bfb1a98001f0e31";
        public const string APP_SECRET = "f13bd1bcb130f0090ed92dc021e5f4e1";
        public const string ERP_CODE = "Z106";
    }

    [Serializable]
    public class ApiCommonParam
    {
        //发放给用户的Key
        public string appKey { get; set; }

        //接口版本
        public string version { get; set; }

        //数据所属公司编码
        public string ownerCompanyCode { get; set; }

        //操作者所属公司编码
        public string operateCompanyCode { get; set; }

        //签名
        public string sign { get; set; }

        //时间戳
        public long? timestamps { get; set; }
        ////扩展字段
        //public object Reserver { get; set; }
    }

    [Serializable]
    public class BodyParam
    {
        public string erpCode { get; set; }
        public string dnXkNo { get; set; }
    }

    public class XkyCommonParam
    {
        public ApiCommonParam commonParam { get; set; }
        public BodyParam body { get; set; }

        public static XkyCommonParam GetInit()
        {
            var apiParam = new ApiCommonParam
            {
                // 发携客云提供的appKey
                appKey = DataAcquisitionConfiguration.APP_KEY,
                // 接口版本
                version = "1.0",
                // 操作者所属公司编码
                operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
                // 数据所属公司编码，非集团公司默认赋值为操作公司
                ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
                // 当前时间对应的时间戳（秒数）
                timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            };


            var appSecret = DataAcquisitionConfiguration.APP_SECRET;

            // 生成签名
            var sign = BuildCurrentSign(
                JsonConvert.SerializeObject(apiParam),
                appSecret);
            apiParam.sign = sign;

            return new XkyCommonParam
            {
                commonParam = apiParam
            };
        }
    }

    /// <summary>
    ///     一致性项目
    /// </summary>
    public class Component
    {
        public string Name { get; set; }
        public List<string> Specs { get; set; }
        public List<string> Manufacturers { get; set; }
        public List<string> Id { get; set; }
        public int SelectedSpec { get; set; }
        public int SelectedMfg { get; set; }
    }

    /// <summary>
    ///     料号图纸接口返回对象
    /// </summary>
@@ -1266,27 +1284,24 @@

        [JsonProperty("totalCount")] public int TotalCount { get; set; }
    }

    /// <summary>
    /// 携客云接口返回对象
    ///     携客云接口返回对象
    /// </summary>
    public class XKYApiResponse
    {
        [JsonProperty("errorCode")]
        public string ErrorCode { get; set; }
        [JsonProperty("errorCode")] public string ErrorCode { get; set; }

        [JsonProperty("errorMsg")]
        public string ErrorMsg { get; set; }
        [JsonProperty("errorMsg")] public string ErrorMsg { get; set; }

        [JsonProperty("result")]
        public int Result { get; set; }
        [JsonProperty("result")] public int Result { get; set; }

        [JsonProperty("data")]
        public object Data { get; set; }
        [JsonProperty("data")] public object Data { get; set; }

        [JsonProperty("curServerTime")]
        public long CurServerTime { get; set; }
        [JsonProperty("curServerTime")] public long CurServerTime { get; set; }

        // 如果需要时间转换可以添加这个属性
        public DateTime ServerTime => DateTimeOffset.FromUnixTimeMilliseconds(CurServerTime).DateTime;
        public DateTime ServerTime => DateTimeOffset
            .FromUnixTimeMilliseconds(CurServerTime).DateTime;
    }
}

 StandardPda/MES.Service/service/QC/RKJService.cs

@@ -76,29 +76,28 @@
        var qsItemOqcItems = db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "3"
                        && b.ItemNo == itemNo).Select(
                b => new QsItemOqcItem
                {
                    ProjName = b.ProjName,
                    ItemMod = b.ItemMod,
                    InspectionMethod = b.InspectionMethod,
                    UsingInstruments = b.UsingInstruments,
                    LevelNum = SqlFunc.IsNull(
                        SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
                        b.InspectionLevel),
                    MaxValue = b.MaxValue,
                    StandardValue = b.StandardValue,
                    MinValue = b.MinValue,
                    Notes = b.Notes,
                    FcheckLevel = b.FcheckLevel,
                    FacLevel = b.FacLevel,
                    QsCode = b.QsCode,
                    QsName = b.QsName,
                    Result = "未检测",
                    isCheck = 0,
                    Picture = b.Picture,
                    Picturename = b.Picturename
                }).ToList();
                        && b.ItemNo == itemNo).Select(b => new QsItemOqcItem
            {
                ProjName = b.ProjName,
                ItemMod = b.ItemMod,
                InspectionMethod = b.InspectionMethod,
                UsingInstruments = b.UsingInstruments,
                LevelNum = SqlFunc.IsNull(
                    SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
                    b.InspectionLevel),
                MaxValue = b.MaxValue,
                StandardValue = b.StandardValue,
                MinValue = b.MinValue,
                Notes = b.Notes,
                FcheckLevel = b.FcheckLevel,
                FacLevel = b.FacLevel,
                QsCode = b.QsCode,
                QsName = b.QsName,
                Result = "未检测",
                isCheck = 0,
                Picture = b.Picture,
                Picturename = b.Picturename
            }).ToList();

        qsItemOqcItems.ForEach(item =>
        {
@@ -377,8 +376,8 @@
            result = 1;
        else if (count - passCount < QsItemOqcItem.FreQty) result = 1;

        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<QsItemOqcItem>()
@@ -443,12 +442,12 @@
    private void setBarCodes(string? FcheckResu, QsItemOqcItemDetail detail,
        SqlSugarClient db)
    {
        var oqcReqList = db.Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>(
                (a, b, c) =>
                    new JoinQueryInfos(
                        JoinType.Left, a.BillNo == b.BillNo,
                        JoinType.Left, c.Daa001 == b.RbillNo
                    ))
        var oqcReqList = db
            .Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>((a, b, c) =>
                new JoinQueryInfos(
                    JoinType.Left, a.BillNo == b.BillNo,
                    JoinType.Left, c.Daa001 == b.RbillNo
                ))
            .Where(a => a.Id == detail.Gid)
            .Select((a, b, c) =>
                new
@@ -471,7 +470,7 @@
                    JoinType.Left, a.Id == b.ItemInId))
            .Where((a, b) => a.BillNo == qsItemOqcReq.BillNo)
            .Select((a, b) => new
            { b.ItemBarcode, b.Quantity, b.MesScgdGxId })
                { b.ItemBarcode, b.Quantity, b.MesScgdGxId })
            .ToList();

        var barCodes = mesInvItemInsList.Select(s => s.ItemBarcode).ToList();
@@ -589,8 +588,8 @@

        var qsItemOqcReqs = db
            .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
                RKJDaa001, Womdaa, VLineUser>(
                (a, b, c, ca, m, da, z) => new JoinQueryInfos(
                RKJDaa001, Womdaa, VLineUser>((a, b, c, ca, m, da, z) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo,
                    JoinType.Left, a.BillNo == c.BillNo,
                    JoinType.Left,
@@ -600,7 +599,7 @@
                    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
                ))
            // .WhereIF(lineNo != null && lineNo.Length > 0,
            //     (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
@@ -842,12 +841,11 @@
        var db = SqlSugarHelper.GetInstance();
        return db
            .Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,
                MesInvItemStocks>(
                (a, b, c, d) => new JoinQueryInfos(
                    JoinType.Inner, a.BillNo == b.BillNo,
                    JoinType.Inner, b.Id == c.ItemInId,
                    JoinType.Inner, c.ItemBarcode == d.ItemBarcode
                ))
                MesInvItemStocks>((a, b, c, d) => new JoinQueryInfos(
                JoinType.Inner, a.BillNo == b.BillNo,
                JoinType.Inner, b.Id == c.ItemInId,
                JoinType.Inner, c.ItemBarcode == d.ItemBarcode
            ))
            .Where((a, b, c, d) => a.Id == gid)
            .Count() > 0;
    }

 StandardPda/MES.Service/service/QC/SJService.cs

@@ -103,8 +103,8 @@

        return db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
                b => new QsItemIpiItem
            .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(b =>
                new QsItemIpiItem
                {
                    ProjName = b.ProjName,
                    ItemMod = b.ItemMod,
@@ -188,21 +188,20 @@
    {
        var qsItemIpiReq = item.From;
        var qsItemIpiItems = item.Items;
        SqlSugarHelper.UseTransactionWithOracle(
            db =>
            {
                qsItemIpiReq.StatusDate = DateTime.Now;
                var pid = db.Insertable(qsItemIpiReq)
                    .ExecuteReturnIdentity();
                qsItemIpiReq.Id = pid;
        SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            qsItemIpiReq.StatusDate = DateTime.Now;
            var pid = db.Insertable(qsItemIpiReq)
                .ExecuteReturnIdentity();
            qsItemIpiReq.Id = pid;

                item.gid = pid;
            item.gid = pid;

                qsItemIpiItems.ForEach(s => s.Pid = pid);
            qsItemIpiItems.ForEach(s => s.Pid = pid);

                return db.Insertable(qsItemIpiItems)
                    .ExecuteCommand();
            });
            return db.Insertable(qsItemIpiItems)
                .ExecuteCommand();
        });
        item.Items = getQSItems(qsItemIpiReq.Id, null);

        //没有上下限的检验项目自动盘点为合格
@@ -222,7 +221,7 @@

        item.Items = getQSItems(qsItemIpiReq.Id, null);
        var sjPageResult = new SJPageResult
        { Id = item.From.Id, Limit = 1, PageIndex = 1 };
            { Id = item.From.Id, Limit = 1, PageIndex = 1 };
        item.Result = getPage(sjPageResult)[0];

        return item;
@@ -231,14 +230,13 @@
    public QsItem SaveItem(QsItem item)
    {
        var qsItemIpiItems = item.Items;
        SqlSugarHelper.UseTransactionWithOracle(
            db =>
            {
                qsItemIpiItems.ForEach(s => s.Pid = item.gid);
        SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            qsItemIpiItems.ForEach(s => s.Pid = item.gid);

                return db.Insertable(qsItemIpiItems)
                    .ExecuteCommand();
            });
            return db.Insertable(qsItemIpiItems)
                .ExecuteCommand();
        });
        item.Items = getQSItems(item.gid, null);

        //没有上下限的检验项目自动盘点为合格
@@ -322,8 +320,8 @@

        if (count == passCount) result = 1;

        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<QsItemIpiItem>()
@@ -358,8 +356,8 @@
            //合格的检验结果等于总检验数视为合格
            if (icount == passCount) result = 1;

            useTransactionWithOracle += SqlSugarHelper.UseTransactionWithOracle(
                db =>
            useTransactionWithOracle +=
                SqlSugarHelper.UseTransactionWithOracle(db =>
                {
                    return db.Updateable<QsItemIpiReq>()
                        .SetColumns(s => s.IsPass == result)

 StandardPda/MES.Service/service/QC/SuspendService.cs

@@ -13,12 +13,12 @@
        var db = SqlSugarHelper.GetInstance();
        //return db.Queryable<SysDepartment>().ToList();
        return db
            .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
                (a, b, c, d) =>
                    new JoinQueryInfos(JoinType.Left,
                        a.Daa002 == b.Id.ToString(),
                        JoinType.Inner, a.Daa001 == c.BillNo,
                        JoinType.Left, b.Departmentcode == d.Departmentcode))
            .Queryable<Womdaa, MesLine, QsQaItemXj,
                SysDepartment>((a, b, c, d) =>
                new JoinQueryInfos(JoinType.Left,
                    a.Daa002 == b.Id.ToString(),
                    JoinType.Inner, a.Daa001 == c.BillNo,
                    JoinType.Left, b.Departmentcode == d.Departmentcode))
            .Where((a, b, c, d) => b.LineName != null &&
                                   statusArray.Contains(a.Daa018))
            .GroupBy((a, b, c, d) => new
@@ -36,11 +36,10 @@
    public List<MesLine> GetLines(string deptCode)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
                (a, b, c) =>
                    new JoinQueryInfos(JoinType.Left,
                        a.Daa002 == b.Id.ToString(),
                        JoinType.Inner, a.Daa001 == c.BillNo))
        var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>((a, b, c) =>
                new JoinQueryInfos(JoinType.Left,
                    a.Daa002 == b.Id.ToString(),
                    JoinType.Inner, a.Daa001 == c.BillNo))
            .Where((a, b, c) => b.LineName != null &&
                                statusArray.Contains(a.Daa018)
                                && b.Departmentcode == deptCode)

 StandardPda/MES.Service/service/QC/XJService.cs

@@ -170,29 +170,28 @@
        return db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "2"
                        && b.ItemNo == itemNo).Select(
                b => new QsQaItemXj01
                {
                    ProjName = b.ProjName,
                    ItemMod = b.ItemMod,
                    InspectionMethod = b.InspectionMethod,
                    UsingInstruments = b.UsingInstruments,
                    LevelNum = SqlFunc.IsNull(
                        SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
                        b.InspectionLevel),
                    MaxValue = b.MaxValue,
                    StandardValue = b.StandardValue,
                    MinValue = b.MinValue,
                    Notes = b.Notes,
                    FcheckLevel = b.FcheckLevel,
                    FacLevel = b.FacLevel,
                    QsCode = b.QsCode,
                    QsName = b.QsName,
                    result = "未检测",
                    isCheck = 0,
                    Picture = b.Picture,
                    Picturename = b.Picturename
                }).ToList();
                        && b.ItemNo == itemNo).Select(b => new QsQaItemXj01
            {
                ProjName = b.ProjName,
                ItemMod = b.ItemMod,
                InspectionMethod = b.InspectionMethod,
                UsingInstruments = b.UsingInstruments,
                LevelNum = SqlFunc.IsNull(
                    SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
                    b.InspectionLevel),
                MaxValue = b.MaxValue,
                StandardValue = b.StandardValue,
                MinValue = b.MinValue,
                Notes = b.Notes,
                FcheckLevel = b.FcheckLevel,
                FacLevel = b.FacLevel,
                QsCode = b.QsCode,
                QsName = b.QsName,
                result = "未检测",
                isCheck = 0,
                Picture = b.Picture,
                Picturename = b.Picturename
            }).ToList();
    }

    public List<QsQaItemXj01> getJYItem(decimal? pid, decimal? id)
@@ -399,8 +398,8 @@

        if (count == passCount) result = 1;

        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<QsQaItemXj01>()

 StandardPda/MES.Service/service/WomcaaManager.cs

@@ -129,7 +129,7 @@

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
        if (single != null) entity.Id = single.Id;
        

        //Caa006 = dto.FMaterialId,
        var mesLinkU9 = Db.Queryable<MesLinkU9>()
            .Where(x => x.U9Id == dto.FMaterialId
@@ -213,7 +213,7 @@
            var entity = Db.Queryable<Womcab>()
                .Where(s => s.Erpid == womcab.Erpid).Single();
            if (entity != null) womcab.Id = entity.Id;
            

            //Cab003 = dto.FMaterialID
            var mesLinkU9 = Db.Queryable<MesLinkU9>()
                .Where(x => x.U9Id == dto.FMaterialID

 StandardPda/MESApplication/Controllers/Base/LoginController.cs

@@ -1,14 +1,10 @@
using Masuit.Tools;
using Masuit.Tools.Database;
using System.Dynamic;
using MES.Service.Dto.@base;
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Dynamic;
using static MES.Service.service.QC.LljService;
using Newtonsoft.Json;

namespace MESApplication.Controllers.Base;

@@ -110,37 +106,30 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    public class Root
    { 
        public string version { get; set; }
      
        public string apkUrl { get; set; }
    }

    /// <summary>
    ///    获取App最新版本信息
    ///     获取App最新版本信息
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getAppUpgradeInfo")]
    public async Task<ResponseResult> getAppUpgradeInfo()
    {
        
        try
        {  
        {
            HttpClient client = new();
    var requestUrl = $"http://192.168.1.104:8081/UpgradeInformation.json";
            var requestUrl =
                "http://192.168.1.104:8081/UpgradeInformation.json";
            var response = await client.GetAsync(requestUrl);
            response.EnsureSuccessStatusCode(); // 检查HTTP状态码
            var responseContent = await response.Content.ReadAsStringAsync();
            var a= JsonConvert.DeserializeObject<Root>(responseContent);
            var a = JsonConvert.DeserializeObject<Root>(responseContent);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = a
            };

        }
        catch (Exception ex)
        {
@@ -148,4 +137,10 @@
        }
    }

    public class Root
    {
        public string version { get; set; }

        public string apkUrl { get; set; }
    }
}

 StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs

@@ -1,10 +1,10 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesDepotsController.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesItemTypeController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesPositionController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesRohInController.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesRohInDataController.cs

@@ -1,8 +1,8 @@
using MES.Service.Modes;
using System.Dynamic;
using MES.Service.Modes;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesStaffController.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/MesUnitController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/ProductionOrderController.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.webApi;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/BasicData/SysDepartmentController.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -6,7 +7,6 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;

namespace MESApplication.Controllers.BasicData;


 StandardPda/MESApplication/Controllers/QC/BaseController.cs

@@ -1,9 +1,9 @@
using MES.Service.Dto.service;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System.Dynamic;

namespace MESApplication.Controllers.QC;

@@ -83,7 +83,7 @@
    }

    /// <summary>
    /// 获取来料检单个检验单上传的所有图片
    ///     获取来料检单个检验单上传的所有图片
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
@@ -110,5 +110,4 @@
            return ResponseResult.ResponseError(ex);
        }
    }

}

 StandardPda/MESApplication/Controllers/QC/LljController.cs

@@ -1,14 +1,12 @@
using Masuit.Tools;
using System.Data;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using NetTaste;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Data;
using System.Dynamic;

namespace MESApplication.Controllers.QC;

@@ -50,7 +48,7 @@
        {
            dynamic resultInfos = new ExpandoObject();

            string[] msg = new LljService().SetItems(itemNo, quantity, releaseNo);
            var msg = new LljService().SetItems(itemNo, quantity, releaseNo);

            return new ResponseResult
            {
@@ -98,10 +96,10 @@
            var releaseNo = data["releaseNo"].ToString();
            var NewStaffUserID = data["NewStaffUserID"].ToString();

            string[] msg = new LljService().SaveCheckBy(NewStaffUserID, userID, releaseNo);
            var msg =
                new LljService().SaveCheckBy(NewStaffUserID, userID, releaseNo);


            
            return new ResponseResult
            {
                status = int.Parse(msg[0]),
@@ -143,19 +141,18 @@
    }

    /// <summary>
    /// 获取一致性核对项目
    ///     获取一致性核对项目
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getYzxItem")]
    public ResponseResult getYzxItem([FromBody] JObject data)
    {
      
        var id = data["id"]?.ToString();
        try
        {
            var tbBillList =new LljService().getYzxBDlist(id);
            
            var tbBillList = new LljService().getYzxBDlist(id);

            return new ResponseResult
            {
                status = 0,
@@ -170,16 +167,15 @@
    }

    /// <summary>
    /// 获取检验单所有不良描述
    ///     获取检验单所有不良描述
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getJYBlmsItem")]
    public ResponseResult getJYBlmsItem([FromBody] JObject data)
    {

        var id = data["id"]?.ToString();
        

        try
        {
            var tbBillList = new LljService().getBlmsItem(id);
@@ -199,25 +195,24 @@


    /// <summary>
    /// 保存一致性核对项目
    ///     保存一致性核对项目
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("saveYzxItem")]
    public ResponseResult saveYzxItem([FromBody] JObject data)
    {

        var id = data["id"]?.ToString();
        var dataDt = data["data"]?.ToString();
        DataTable dt = JsonConvert.DeserializeObject<DataTable>(dataDt);
        var dt = JsonConvert.DeserializeObject<DataTable>(dataDt);
        try
        {
            new LljService().saveYzxBDlist(id, dt);
            string[] msg=new LljService().YzxImgVerify(id);
            var msg = new LljService().YzxImgVerify(id);

            return new ResponseResult
            {
                status = int.Parse( msg[0]),
                status = int.Parse(msg[0]),
                message = msg[1],
                data = ""
            };
@@ -229,14 +224,13 @@
    }

    /// <summary>
    /// 获取所有检验员信息
    ///     获取所有检验员信息
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getAllInspectors")]
    public ResponseResult getAllInspectors([FromBody] JObject data)
    {
      
        try
        {
            var tbBillList = new LljService().getAllInspectors();
@@ -281,7 +275,7 @@


    /// <summary>
    /// 通过条码获取送检单信息
    ///     通过条码获取送检单信息
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
@@ -311,20 +305,19 @@


    /// <summary>
    /// 获取不良描述信息
    ///     获取不良描述信息
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getBlmsItem")]
    public ResponseResult getBlmsItem([FromBody] JObject data)
    {

       
        try
        {
            var tbBillList = new LljService().getBlmsItem();
            string[] arrRate = tbBillList.AsEnumerable().Select(d => d.Field<string>("DEFECT_NAME")).ToArray();
             
            string[] arrRate = tbBillList.AsEnumerable()
                .Select(d => d.Field<string>("DEFECT_NAME")).ToArray();


            return new ResponseResult
            {
@@ -464,7 +457,7 @@
        {
            dynamic resultInfos = new ExpandoObject();
            var msg = new LljService().IqcQaSubmit(rkjDto);
             

            return new ResponseResult
            {
                status = int.Parse(msg[0]),
@@ -477,6 +470,7 @@
            return ResponseResult.ResponseError(ex);
        }
    }

    //IqcQaSubmit
    [HttpPost("getImgBDlist")]
    public ResponseResult getImgBDlist([FromBody] JObject data)
@@ -484,7 +478,7 @@
        try
        {
            var id = data["id"]?.ToString();
             

            var db = new LljService().getImgBDlist(id);

            return new ResponseResult
@@ -501,12 +495,13 @@
    }

    /// <summary>
    /// 获取U9图纸数据
    ///     获取U9图纸数据
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("GetFileUrlByU9List")]
    public async Task<ResponseResult> GetFileUrlByU9List([FromBody] JObject data)
    public async Task<ResponseResult> GetFileUrlByU9List(
        [FromBody] JObject data)
    {
        try
        {
@@ -516,32 +511,28 @@
            var lljService = new LljService();
            var tbBillList = await lljService.GetFileUrlByU9List(type, itemID);
            if (tbBillList != null)
            {
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = tbBillList
                };
            }
            else
            {
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = ""
                };
            }

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = ""
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// 实验室送检数据保存
    ///     实验室送检数据保存
    /// </summary>
    /// <param name="sysSubmit">实验室送检数据</param>
    /// <returns></returns>
@@ -550,8 +541,7 @@
    {
        try
        {

            string[] msg = new LljService().SaveSysSubmit(sysSubmit);
            var msg = new LljService().SaveSysSubmit(sysSubmit);

            return new ResponseResult
            {
@@ -567,7 +557,7 @@
    }

    /// <summary>
    /// 送货单签收并生成到货单
    ///     送货单签收并生成到货单
    /// </summary>
    /// <param name="id"></param>
    /// <returns></returns>
@@ -576,9 +566,8 @@
    {
        try
        {

             //string[] msg = new LljService().SaveSysSubmit(sysSubmit);
            string[] msg= await new LljService().SignDelivery(id);
            //string[] msg = new LljService().SaveSysSubmit(sysSubmit);
            var msg = await new LljService().SignDelivery(id);
            return new ResponseResult
            {
                status = int.Parse(msg[0]),

 StandardPda/MESApplication/Controllers/QC/RKJController.cs

@@ -1,10 +1,10 @@
using MES.Service.Dto.service;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System.Dynamic;

namespace MESApplication.Controllers.QC;


 StandardPda/MESApplication/Controllers/QC/SJController.cs

@@ -1,10 +1,10 @@
using MES.Service.Dto.service;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System.Dynamic;

namespace MESApplication.Controllers.QC;


 StandardPda/MESApplication/Controllers/QC/SuspendController.cs

@@ -1,9 +1,9 @@
using MES.Service.Dto.service;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System.Dynamic;

namespace MESApplication.Controllers.QC;


 StandardPda/MESApplication/Controllers/QC/XJController.cs

@@ -1,10 +1,10 @@
using MES.Service.Dto.service;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System.Dynamic;

namespace MESApplication.Controllers.QC;


 StandardPda/MESApplication/Filter/ActionFilter.cs

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics;
using System.Text;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Newtonsoft.Json;
using System.Diagnostics;
using System.Text;

namespace MESApplication.Filter;


 StandardPda/MESApplication/Startup.cs

@@ -1,11 +1,11 @@
using MES.Service.Dto.@base;
using System.Reflection;
using MES.Service.Dto.@base;
using MES.Service.util;
using MESApplication.Filter;
using Microsoft.OpenApi.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using Swashbuckle.AspNetCore.SwaggerUI;
using System.Reflection;

namespace MESApplication;

@@ -36,7 +36,7 @@
        {
            c.SwaggerDoc("v1",
                new OpenApiInfo
                { Title = "MESApplication.Api", Version = "v1" });
                    { Title = "MESApplication.Api", Version = "v1" });
            var xmlFile =
                $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
            var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);

 StandardPda/MESApplication/appsettings.json

@@ -12,7 +12,7 @@
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    //正式库
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_prd; Password=zmzprd"
   //测试库（发布时请切换正式库，提交代码勿提交此文件）
      //"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest"
    //测试库（发布时请切换正式库，提交代码勿提交此文件）
    //"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest"
  }
}