来料检上传附件

xwt

8 小时以前 986bbf207ec3ecab9dfbf3fed50b565d2a2676fc

 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;
    }

    //选择产线
@@ -50,14 +50,14 @@


    //获取工单号
    public List<RkDaa002> GetDaa001s(string lineNo)
    public List<RKJDaa001> GetDaa001s(string lineNo)
    {
        var db = SqlSugarHelper.GetInstance();
        // return db.Queryable<RKJDaa001>()
        //     .Where(t => t.LineNo == lineNo)
        //     .OrderBy(t => t.BillNo, OrderByType.Desc)
        //     .ToList();
        return null;
        return db.Queryable<RKJDaa001>()
            .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,