From b2be3b6939b4382f9165c78857a072f1aa7b01d0 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期六, 12 四月 2025 12:34:02 +0800
Subject: [PATCH] 更新平板功能，首检页面生成巡检单
---
MES.Service/service/QC/RKJService.cs | 86 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 14 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 5ca88ff..8dfeb26 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -57,11 +57,10 @@
public List<RkDaa002> 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<RkDaa002>()
+ .Where(t => lineNo.Contains(t.Daa020))
+ .OrderBy(t => t.BillNo, OrderByType.Desc)
+ .ToList();
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
@@ -483,6 +482,10 @@
var barCodes = mesInvItemInsList.Select(s => s.ItemBarcode).ToList();
+ var count = db.Queryable<MesInvItemBarcodes>()
+ .Where(s => barCodes.Contains(s.ItemBarcode) && s.WorkFlg == 0)
+ .Count();
+
var gxId = mesInvItemInsList.Select(s => s.MesScgdGxId).ToList();
var sumQty = mesInvItemInsList.Sum(s => s.Quantity);
@@ -494,6 +497,23 @@
.SetColumns(s => s.CheckFlag == "鈭�")
.Where(s => gxId.Contains(s.Id))
.ExecuteCommand();
+
+ if (count <= 0) return;
+
+ //鍙栨秷mes_inv_item_barcodes 鐨勬姤宸ユ爣璇� WORK_FLG 浣跨敤鏉＄爜
+ var executeCommand = db.Updateable<MesInvItemBarcodes>()
+ .SetColumns(a => a.WorkFlg == 1)
+ .Where(a => barCodes.Contains(a.ItemBarcode))
+ .ExecuteCommand();
+
+ if (executeCommand > 0)
+ {
+ //womdaa 宸茬敓浜ч噺 DAA011鍔犲洖鏉＄爜鎶ュ伐鏁伴噺
+ db.Updateable<Womdaa>()
+ .SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
+ .Where(b => b.Daa001 == qsItemOqcReq.Daa001)
+ .ExecuteCommand();
+ }
}
else if ("涓嶅悎鏍�".Equals(FcheckResu))
{
@@ -579,8 +599,8 @@
var qsItemOqcReqs = db
.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
- RKJDaa001, Womdaa, VLineUser>(
- (a, b, c, ca, m, da, z) => new JoinQueryInfos(
+ RKJDaa001, Womdaa, VLineUser,MesDeptUser, Womcaa, ExZzCaaFiled>(
+ (a, b, c, ca, m, da, z,d, caa,zf) => new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo,
JoinType.Left, a.BillNo == c.BillNo,
JoinType.Left,
@@ -589,25 +609,34 @@
c.Factory == ca.Factory,
JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
JoinType.Left, da.Daa001 == c.RbillNo,
- JoinType.Left, da.Daa015 == z.LineNo
+ JoinType.Left, da.Daa015 == z.LineNo,
+ JoinType.Left,c.Bgr == d.UserNo,
+ JoinType.Left, da.Daa021 == caa.Caa020,
+ JoinType.Left, caa.Erpid == zf.Erpid
))
// .WhereIF(lineNo != null && lineNo.Length > 0,
// (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
.WhereIF(!"PL017".Equals(queryObj.createUser),
- (a, b, c, ca, m, da, z) => lineNo.Contains(da.Daa015))
+ (a, b, c, ca, m, da, z, d, caa, zf) => lineNo.Contains(da.Daa015))
.WhereIF(!string.IsNullOrEmpty(queryObj.id),
- (a, b, c, ca, m, da, z) => a.Id.ToString() == queryObj.id)
+ (a, b, c, ca, m, da, z, d, caa, zf) => a.Id.ToString() == queryObj.id)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c, ca, m, da, z) => a.FcheckResu == null)
+ (a, b, c, ca, m, da, z, d, caa, zf) => a.FcheckResu == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c, ca, m, da, z) => a.FcheckResu != null)
- .Select((a, b, c, ca, m, da, z) => new QsItemOqcReq
+ (a, b, c, ca, m, da, z, d, caa, zf) => a.FcheckResu != null)
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
+ .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ (a, b, c, ca, m, da, z, d, caa, zf) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .Select((a, b, c, ca, m, da, z, d, caa, zf) => new QsItemOqcReq
{
BillNo = a.BillNo,
+ Fsubmit = a.Fsubmit,
Remarks = a.Remarks,
Id = a.Id,
CreateDate = a.CreateDate,
@@ -623,7 +652,10 @@
ItemInId = m.ItemInId,
Daa015 = da.Daa015,
LineNo = c.LineNo,
- Quantity = m.Quantity
+ Quantity = m.Quantity,
+ Caa015 = caa.Caa015,
+ cust = da.Cust == null ? zf.Cust : da.Cust,
+ Bgr = d.UserName
})
.OrderBy(a => a.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -807,4 +839,30 @@
return Convert.ToInt32(rkjDto.gid);
}
+
+ public int cleanReqResult(RKJDto dto)
+ {
+ if (isRk(dto.gid)) throw new Exception("宸叉湁鏉＄爜鍏ュ簱锛屼笉鍏佽娓呴櫎妫�楠岀粨鏋�");
+
+
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemOqcReq>()
+ .SetColumns(s => s.FcheckResu == null)
+ .Where(s => s.Id == dto.gid).ExecuteCommand();
+ });
+ }
+
+ private bool isRk(int? gid)
+ {
+ 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
+ ))
+ .Where((a, b, c,d) => a.Id == gid)
+ .Count() > 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3