一致性代码提交

zjh

2025-05-12 4758d6873110195be6df2840b20fc5c8ca85d240

一致性代码提交

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

@@ -22,5 +22,17 @@
    ///   搜全部，或者当前用户（默认0，当前用户，1：全部）
    /// </summary>
    public string? UserIndex { get; set; }
    /// <summary>
    ///  开始时间
    /// </summary>
    public string? startDate { get; set; }
    /// <summary>
    ///  结束时间
    /// </summary>
    public string? endDate { get; set; }
    /// <summary>
    ///  状态（合格 or 不合格）
    /// </summary>
    public string? state { get; set; }

}

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

@@ -7,6 +7,7 @@
using Newtonsoft.Json;
using SharpCompress.Factories;
using SqlSugar;
using System.ComponentModel;
using System.Data;
using System.Xml.Linq;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
@@ -68,7 +69,9 @@
            .WhereIF(queryObj.SelectedIndex == "1" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "2" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "3" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "4" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.result== "已完成", (a, b, d, e) => (a.IqcDate>= queryObj.startDate.ToDateTime()&& a.IqcDate <= queryObj.endDate.ToDateTime().AddDays(1)))
            .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
            {
@@ -434,6 +437,7 @@
                    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)
            .GroupBy((a, b) => new
            {
                a.Id,
@@ -696,8 +700,87 @@
                                    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+"");
        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 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>();



        for (int i = 0; i <dataTable1.Rows.Count; i++)
        {
            Component 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())
                {
                    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")
                    {
                        component.SelectedSpec = index;
                        component.SelectedMfg = index;
                    }
                    index++;
                }
            }

            Components.Add(component);
        }
        return Components;
    }
    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 + "' ");
        SQLHelper.ExecuteQuery(sql1);
        string rowId = "";
        for (int 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 + ") ");
        SQLHelper.ExecuteQuery(sql2);

    }
    public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail)
    {
        var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
@@ -764,8 +847,8 @@
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetectDetail5>()
                // .SetColumns(it =>
                //     it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                 .SetColumns(it =>
                     it.Funit == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
        });

 StandardPda/MESApplication/Controllers/QC/BaseController.cs

@@ -61,7 +61,7 @@
    [HttpPost("getByFid")]
    public ResponseResult getByFid([FromBody] JObject data)
    {
        var id = Convert.ToInt32(data["fid"].ToString());
        var id = Convert.ToInt64(data["fid"].ToString());
        var qsType = data["qsType"].ToString();
        try
        {

 StandardPda/MESApplication/Controllers/QC/LljController.cs

@@ -4,7 +4,9 @@
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;
@@ -138,6 +140,64 @@
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// 获取一致性核对项目
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getYzxItem")]
    public ResponseResult getYzxItem([FromBody] JObject data)
    {
      
        var id = data["id"]?.ToString();
        var releaseNo = data["releaseNo"]?.ToString();
        try
        {
            var tbBillList =new LljService().getYzxBDlist(id);
            
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = tbBillList
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <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);
        try
        {
            new LljService().saveYzxBDlist(id, dt);

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

    /// <summary>
    /// 获取所有检验员信息
    /// </summary>
@@ -358,6 +418,28 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    //IqcQaSubmit
    [HttpPost("getImgBDlist")]
    public ResponseResult getImgBDlist([FromBody] JObject data)
    {
        try
        {
            var id = data["id"]?.ToString();
             
            var db = new LljService().getImgBDlist(id);

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

    /// <summary>
    /// 获取U9图纸数据

 StandardPda/MESApplication/appsettings.json

@@ -10,6 +10,9 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "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"
  }
}