From 41975878bf0b8d3632d8c5f21714502a57632070 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 23 七月 2025 16:08:39 +0800
Subject: [PATCH] 紧急放行修改
---
StandardInterface/MES.Service/service/QC/RKJService.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index 07260a8..f103adf 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/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,
--
Gitblit v1.9.3