This commit is contained in:
PastSaid
2025-01-01 08:21:58 +08:00
parent 9725ab5376
commit 3d15fd4b7e
59 changed files with 3013 additions and 1324 deletions

View File

@@ -47,27 +47,9 @@ namespace GZ.LJY000.Biori.SAL_OUTSTOCK
var rows = result.ReturnData as DynamicObjectCollection;
if (rows.Any())
{
//var parentRows = rows.Where(w => !w["FParentRowId"].ToString().IsNullOrEmpty());
//var subRows = rows.Where(w => w["FParentRowId"].ToString().IsNullOrEmpty());
foreach (var item in entity)
{
DynamicObject row = null;
//var parentRowId = item["ParentRowId"].ToString();
//var rowId = item["RowId"].ToString();
//if (parentRowId.IsNullOrEmpty())
//{
// //var row = rows.FirstOrDefault(w => w["FRowId"].ToString() == item["RowId"].ToString());
// row = parentRows.FirstOrDefault(w => w["FMaterialID_Id"].Long2Int() == item["MaterialID_Id"].Long2Int());
//}
//else
//{
// var parentMatId = item["ParentMatId_Id"].Long2Int();
// var parentRow = parentRows.FirstOrDefault(w => w["FMaterialID_Id"].Long2Int() == parentMatId);
// row = subRows.FirstOrDefault(w => w["FParentRowId"].ToString() == parentRow["FRowId"].ToString() && w["FMaterialID_Id"] == item["MaterialID_Id"]);
//}
row = rows.FirstOrDefault(w => w["FMaterialID_Id"].Long2Int() == item["MaterialID_Id"].Long2Int());
DynamicObject row = rows.FirstOrDefault(w => w["FPackBillNo"].IsNullOrEmpty() && w["FMaterialID_Id"].Long2Int() == item["MaterialID_Id"].Long2Int());
if (row != null)
{