From a204df28fd20b4908bba80deb482f9c91ecc0877 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 08 一月 2025 16:22:23 +0800
Subject: [PATCH] 11
---
service/Wom/WwGdManager.cs | 56 +++++++++++++++++++++-----------------------------------
1 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/service/Warehouse/WomdaaManager.cs b/service/Wom/WwGdManager.cs
similarity index 82%
copy from service/Warehouse/WomdaaManager.cs
copy to service/Wom/WwGdManager.cs
index 3174d1a..103187c 100644
--- a/service/Warehouse/WomdaaManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -6,30 +6,10 @@
using NewPdaSqlServer.entity;
using SqlSugar;
-namespace NewPdaSqlServer.service.Warehouse;
+namespace NewPdaSqlServer.service.Wom;
-public class WomdaaManager : Repository<Womdaa>
+public class WwGdManager : Repository<WwGd>
{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomdaaManager.cs
-
- //鑾峰彇宸ュ崟鍙�
- public List<string> GetProductionPickDaa001(WarehouseQuery query)
- {
- var sql =
- "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" +
- query.daa001 +
- "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
-
- return Db.Ado.SqlQuery<string>(sql);
- }
-
- //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
- public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
- {
- return getDaa001(query);
- }
-
public ProductionPickDto ScanCode(WarehouseQuery query)
{
var _strMsg = "";
@@ -40,7 +20,7 @@
if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
- using (var cmd = new SqlCommand("[prc_pda_SCLL]", conn))
+ using (var cmd = new SqlCommand("[prc_pda_WWLL]", conn))
{
try
{
@@ -107,7 +87,7 @@
var _intSum = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[prc_pda_SCLL_CF]", conn))
+ using (var cmd = new SqlCommand("[prc_pda_WWLL_CF]", conn))
{
try
{
@@ -154,34 +134,39 @@
}
}
+ public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
+ {
+ return getDaa001(query);
+ }
+
private ProductionPickDto getDaa001(WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
- var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+ var womdaa = Db.Queryable<WwGd, MesItems>((a, i) =>
new JoinQueryInfos(JoinType.Left,
- a.Daa002 == i.ItemId.ToString()))
+ a.Daa003 == i.ItemId))
.Where((a, i) => a.Daa001 == query.daa001)
.Select((a, i) => new
{
- a.Daa001, a.CaaGuid
+ a.Daa001, a.Eid
}).First();
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
- var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
+ var womdabs = Db.Queryable<WwGd, WwGdDetail, MesItems, Womcab>(
(a, b, c, d) =>
new JoinQueryInfos(
JoinType.Left,
- a.Guid == b.DaaGuid,
+ a.Id == b.Pid,
JoinType.Inner,
- c.Id.ToString() ==
+ c.Id ==
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
+ .Select((a, b, c, d) => new WwGdDetail
{
Pid = b.Pid,
Dab003 = b.Dab003,
@@ -215,15 +200,16 @@
})
.ToList();
- var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
+ var womcaa = Db.Queryable<ProductionOrder>()
+ .Where(s => s.ErpId == womdaa.Eid.ToString())
.First();
var dto = new ProductionPickDto
{
daa001 = womdaa.Daa001,
- PlanNo = womcaa.Caa020,
- totals = womdabs,
- daisao = list,
+ PlanNo = womcaa.ErpProductionOrderNo,
+ totals1 = womdabs,
+ daisao1 = list,
yisao = mesInvItemOutCDetailsList
};
--
Gitblit v1.9.3