来料检上传附件

xwt

2 天以前 986bbf207ec3ecab9dfbf3fed50b565d2a2676fc

来料检上传附件

 StandardInterface/MES.Service/Dto/service/RKJDaa001.cs

@@ -7,32 +7,39 @@

[SugarTable("V_QS_RK_DAA001")] //用于SqlSugar
public class RKJDaa001 : Page
{
    // 送检批次
{   // pID
    [SugarColumn(ColumnName = "ITEM_IN_ID")]
    public decimal? ItemInId { get; set; }
    // 工单号
    [SugarColumn(ColumnName = "RBILL_NO")]
    public string? RBillNo { get; set; }

    // 任务单号
    // 物料编码
    [SugarColumn(ColumnName = "ITEM_NO")] 
    public string? ItemNo { get; set; }

    //物料名称
    [SugarColumn(ColumnName = "ITEM_NAME")]
    public string? ItemName { get; set; }

    // 订单数量
    // 送检数量
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

    // 规格型号
    [SugarColumn(ColumnName = "ITEM_MODEL")]
    public string? ItemModel { get; set; }

    //产线编码
    [SugarColumn(ColumnName = "DAA015")]
    public string? Daa015 { get; set; }

    //产线编码
    [SugarColumn(ColumnName = "DAA015")]
    //产线名称
    [SugarColumn(ColumnName = "DAA020")]
    public string? Daa020 { get; set; }

    //申请单号
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? billNo { get; set; }
    public string? BillNo { get; set; }

}

 StandardInterface/MES.Service/Dto/service/RKJDto.cs

@@ -17,6 +17,8 @@

    //备注
    public string? Remarks { get; set; }
    // 送检批次
    public string? RbillNo { get; set; }

    //==========================================
    //巡检主子表需要的数据

 StandardInterface/MES.Service/Modes/QsItemOqcReq.cs

@@ -119,6 +119,12 @@
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }

    /// <summary>
    ///     送检批次
    /// </summary>
    [SugarColumn(ColumnName = "RBILL_NO")]
    public string? RbillNo { get; set; }

    // 添加以下字段以适应查询返回的数据
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }


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

@@ -17,7 +17,7 @@
        var db = SqlSugarHelper.GetInstance();
        var date = DateTime.Now.ToString("yyyy-MM-dd");
        var sql =
            "select max(RELEASE_NO) from QS_ITEM_OQC_REQ where RELEASE_NO like 'RKJN%' and to_char(CREATE_DATE,'yyyy-mm-dd') ='" +
            "select max(RELEASE_NO) from QS_ITEM_OQC_REQ where RELEASE_NO like 'RKJY%' and to_char(CREATE_DATE,'yyyy-mm-dd') ='" +
            date + "'";

        var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
@@ -31,7 +31,7 @@
            number = no.ToString().PadLeft(4, '0');
        }

        return "RKJN" + date.Replace("-", "") + number;
        return "RKJY" + date.Replace("-", "") + number;
    }

    //选择产线
@@ -54,8 +54,8 @@
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<RKJDaa001>()
            .Where(t => t.Daa020 == lineNo)
            .OrderBy(t => t.ItemInId, OrderByType.Desc)
            .Where(t => t.Daa015 == lineNo)
            .OrderBy(t => t.BillNo, OrderByType.Desc)
            .ToList();
        //return null;
    }
@@ -228,6 +228,9 @@

            xj.CreateBy = userNo;
            xj.CreateDate = DateTime.Now;
            // 新增：保存送检批次
            if (!string.IsNullOrEmpty(rkjDto.RbillNo))
                xj.RbillNo = rkjDto.RbillNo;

            var pid = db.Insertable(xj).ExecuteReturnIdentity();

@@ -479,9 +482,8 @@
                FcheckBy = a.FcheckBy,
                FcheckDate = a.FcheckDate,
                ReleaseNo = a.ReleaseNo,
                RbillNo = a.RbillNo,
                // 添加其他字段
                // 如果在 QsItemOqcReq 中定义了额外字段，则需要将它们赋值
                // 例如:
                ItemName = b.ItemName,
                ItemModel = b.ItemModel,
                TaskNo = c.TaskNo,

 StandardInterface/MESApplication/Controllers/QC/LljController.cs

@@ -351,10 +351,10 @@
    [HttpGet("DownloadFtpFile")]
    public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName)
    {
        // FTP服务器信息（请替换为实际信息）
        // FTP服务器信息
        string ftpServer = "ftp://36.26.21.214";
        string ftpUser = "hm_ftp";
        string ftpPwd = "dell_123"; // 已更新为真实密码
        string ftpPwd = "dell_123"; 
        string ftpPath = $"{ftpServer}/IQC/{itemNo}/{fileName}";
        try
        {
@@ -362,7 +362,7 @@
            request.Method = System.Net.WebRequestMethods.Ftp.DownloadFile;
            request.Credentials = new System.Net.NetworkCredential(ftpUser, ftpPwd);
            request.UseBinary = true;
            request.UsePassive = true;
            request.UsePassive = false;
            using (var response = (System.Net.FtpWebResponse)request.GetResponse())
            using (var ftpStream = response.GetResponseStream())
            using (var ms = new System.IO.MemoryStream())

 StandardInterface/MESApplication/Controllers/QC/XJController.cs

@@ -122,6 +122,8 @@
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new XJService().getBoardItem(lineNo);
            // 按 itemNo 去重
            tbBillList = tbBillList.GroupBy(x => x.ItemNo).Select(g => g.First()).ToList();
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {