From f862d5003ac180b79cd14478fd17dba1b4b28a82 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 12 三月 2025 08:19:13 +0800
Subject: [PATCH] 1.采购入库优化 2.生产领料优化 3.生产不补料优化
---
service/Wom/WomdaaManager.cs | 6 +-
service/Warehouse/MesItemBlManager.cs | 8 ++--
service/Warehouse/MesXsckManager.cs | 2
entity/Womdab.cs | 20 +++++-----
entity/Womdaa.cs | 20 +++++-----
service/Warehouse/MesInvItemInCDetailsManager.cs | 6 ++-
6 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/entity/Womdaa.cs b/entity/Womdaa.cs
index 91d69a7..5ff5888 100644
--- a/entity/Womdaa.cs
+++ b/entity/Womdaa.cs
@@ -23,17 +23,17 @@
[SugarColumn(ColumnName = "caaGuid")]
public Guid? CaaGuid { get; set; }
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "id")]
- public int? Id { get; set; }
+ ///// <summary>
+ ///// 鑷鍒�
+ ///// </summary>
+ //[SugarColumn(ColumnName = "id")]
+ //public int? Id { get; set; }
- /// <summary>
- /// 鎺掍骇ID
- /// </summary>
- [SugarColumn(ColumnName = "pid")]
- public int? Pid { get; set; }
+ ///// <summary>
+ ///// 鎺掍骇ID
+ ///// </summary>
+ //[SugarColumn(ColumnName = "pid")]
+ //public int? Pid { get; set; }
/// <summary>
/// 鍗曞彿
diff --git a/entity/Womdab.cs b/entity/Womdab.cs
index 89709cc..e2e233a 100644
--- a/entity/Womdab.cs
+++ b/entity/Womdab.cs
@@ -18,17 +18,17 @@
[SugarColumn(ColumnName = "daaGuid")]
public Guid? DaaGuid { get; set; }
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "id")]
- public int? Id { get; set; }
+ ///// <summary>
+ ///// 鑷鍒�
+ ///// </summary>
+ //[SugarColumn(ColumnName = "id")]
+ //public int? Id { get; set; }
- /// <summary>
- /// PID
- /// </summary>
- [SugarColumn(ColumnName = "pid")]
- public int? Pid { get; set; }
+ ///// <summary>
+ ///// PID
+ ///// </summary>
+ //[SugarColumn(ColumnName = "pid")]
+ //public int? Pid { get; set; }
/// <summary>
/// 宸ュ崟鍗曞彿
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 4192c79..fb5e185 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -293,7 +293,8 @@
Remark = itemBarcodeDetails.Memo,
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
- DepotId = depotCode2
+ DepotId = depotCode2,
+ itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
db.Updateable<MesInvItemInCItems>()
@@ -515,7 +516,8 @@
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
ItemId = itemBarcodeDetails.ItemId,
- DepotId = depotCode2
+ DepotId = depotCode2,
+ itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
// 瀛樺湪鏃舵洿鏂版暟閲�
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index ab11663..c648107 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -375,7 +375,7 @@
Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
Dab021 = (it.Dab021 ?? 0) + stockBarcode.Quantity
})
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
+ .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
.ExecuteCommand();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -887,7 +887,7 @@
Dab020 = (it.Dab020 ?? 0) + query.Num, // 宸插彂鏂欐暟閲�
Dab021 = (it.Dab021 ?? 0) + query.Num // 宸插彂鏂欐暟閲�
})
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
+ .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
.ExecuteCommand();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -1316,7 +1316,7 @@
Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
})
- .Where(it => it.Id == womdab.Id)
+ .Where(it => it.Guid == womdab.Guid)
.ExecuteCommand();
// 鏇存柊瓒呴鍗曟槑缁�
@@ -1720,7 +1720,7 @@
Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
})
- .Where(it => it.Id == workOrderDetail.Id)
+ .Where(it => it.Guid == workOrderDetail.Guid)
.ExecuteCommand();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
diff --git a/service/Warehouse/MesXsckManager.cs b/service/Warehouse/MesXsckManager.cs
index 446cbb7..fcc2cd6 100644
--- a/service/Warehouse/MesXsckManager.cs
+++ b/service/Warehouse/MesXsckManager.cs
@@ -590,7 +590,7 @@
Dab020 = (it.Dab020 ?? 0) + query.Num, // 宸插彂鏂欐暟閲�
Dab021 = (it.Dab021 ?? 0) + query.Num // 宸插彂鏂欐暟閲�
})
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
+ .Where(it => it.Guid == womdab.Guid && it.Dab003 == womdab.Dab003)
.ExecuteCommand();
// 鏇存柊鍙戣揣閫氱煡鍗曟槑缁嗗凡琛ユ暟閲�
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 8973826..425e39d 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -17,9 +17,9 @@
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 '%" +
+ "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY DAB002) B ON A.GUID = B.daaGuid WHERE DAA001 = " +
query.daa001 +
- "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
+ " and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
return Db.Ado.SqlQuery<string>(sql);
}
@@ -186,7 +186,7 @@
a.Daa001 == query.daa001 && d.IssueType == "1")
.Select((a, b, c, d) => new Womdab
{
- Pid = b.Pid,
+ //Pid = b.Pid,
Dab003 = b.Dab003,
Dab006 = b.Dab006,
Dab007 = b.Dab007,
--
Gitblit v1.9.3