From ddea1761f2f6040a3e0b5bb1f693684306f4c4d4 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 07 四月 2025 11:18:33 +0800
Subject: [PATCH] 1.产品绑定模块 2.来料检提交oa
---
service/Wom/WomdaaManager.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 27 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 425e39d..5e2300b 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -1,9 +1,11 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
+using Microsoft.SqlServer.Server;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using SqlSugar;
namespace NewPdaSqlServer.service.Wom;
@@ -172,31 +174,43 @@
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
- var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
- (a, b, c, d) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.Guid == b.DaaGuid,
- JoinType.Inner,
- c.Id.ToString() ==
- b.Dab003,
- JoinType.Inner, b.Erpid == d.Erpid
- ))
- .Where((a, b, c, d) =>
- a.Daa001 == query.daa001 && d.IssueType == "1")
- .Select((a, b, c, d) => new Womdab
- {
- //Pid = b.Pid,
- Dab003 = b.Dab003,
- Dab006 = b.Dab006,
- Dab007 = b.Dab007,
- wNum = b.Dab006 - b.Dab007, // 璁＄畻瀛楁 W_NUM
- ItemName = c.ItemName, // 鍔ㄦ�佸瓧娈� ITEM_NAME
- ItemNo = c.ItemNo // 鍔ㄦ�佸瓧娈� ITEM_NO
- })
- .ToList();
+ //var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
+ // (a, b, c, d) =>
+ // new JoinQueryInfos(
+ // JoinType.Left,
+ // a.Guid == b.DaaGuid,
+ // JoinType.Inner,
+ // c.Id.ToString() ==
+ // b.Dab003,
+ // JoinType.Inner, b.Erpid == d.Erpid
+ // ))
+ // .Where((a, b, c, d) =>
+ // a.Daa001 == query.daa001 && d.Iss1ueType == "1")
+ // .Select((a, b, c, d) => new ItemDetailModel
+ // {
+ // ItemNo = c.ItemNo,
+ // ItemName = c.ItemName,
+ // ItemModel = c.ItemModel,
+ // FQty = b.Dab006, // 鐢宠鏁伴噺
+ // SQty = b.Dab007, // 宸叉壂鏁伴噺
+ // DSQty = b.Dab006 - b.Dab007, // 宸叉壂鏁伴噺
+ // })
+ // .ToList();
- var list = womdabs.Where(s => s.wNum > 0).ToList();
+ var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
+ dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw
+ FROM WOMDAB B
+ LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
+ LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
+ LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
+ WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 ORDER BY DAB002", query.daa001);
+
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
+
+
+ var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
+
+ var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
var mesInvItemOutCDetailsList = Db
.Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
@@ -230,11 +244,61 @@
{
daa001 = womdaa.Daa001,
PlanNo = womcaa.Caa020,
- totals = womdabs,
- daisao = list,
- yisao = mesInvItemOutCDetailsList
+ items = DS_list,
+ Ysitems = YS_list
+ // yisao = mesInvItemOutCDetailsList
};
return dto;
}
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟鏉＄爜淇℃伅
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public dynamic getZsBarInfo(dynamic query)
+ {
+
+ var sql = string.Format(@"SELECT TOP 1 A.barCode AS zsBarcode,
+ D.name AS lineName,
+ D.line_no,
+ B.daa001,
+ C.item_no,
+ C.item_name,
+ C.item_model,
+ A.quantity as barQty,
+ B.daa008 as sumQty,
+ isnull((SELECT count(1) FROM WORK_COLLECT WHERE processNo = '{0}' AND ABOUT_GUID = A.ABOUT_GUID),0) AS finQty,
+ isnull((SELECT TOP 1 processNo FROM WORK_COLLECT WHERE WORK_COLLECT.barCode = '{1}' AND checkResult = '鈭�' ORDER BY WORK_COLLECT.createDate DESC ),'') AS lastGx
+FROM WORK_TRAC_CODE A
+ LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
+ LEFT JOIN MES_ITEMS C ON B.daa002 = C.item_id
+ LEFT JOIN MES_WORKSHOP_LINE D ON A.lineId = D.id
+WHERE A.barCode = '{1}'", query.GX, query.Zsbarcode);
+
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
+
+ if (ZsBarInfo.Count < 1)
+ {
+ throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄤ笉瀛樺湪");
+ }
+
+ return ZsBarInfo;
+ }
+
+ //鑾峰彇鐢熶骇
+ public dynamic getTraceability(dynamic query)
+ {
+ var sql = string.Format(@"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
+FROM WORK_COLLECT A
+ LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
+ LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
+ LEFT JOIN MES_WORKSHOP_LINE D ON B.lineId = D.id
+WHERE A.barCode = '{0}'", query.Zsbarcode);
+
+ var Traceability = Db.Ado.SqlQuery<dynamic>(sql);
+
+ return Traceability;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3