From ffcef3d87676ebaf7f22413711b57bbe0404b3f2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 八月 2025 16:17:21 +0800
Subject: [PATCH] 冲突分支合并 2025-08-12 16:17
---
WebAPI/Models/Sc_WorkBillSortBillMain.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Models/Sc_WorkBillSortBillMain.cs b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
index 5cc7bff..595fd5e 100644
--- a/WebAPI/Models/Sc_WorkBillSortBillMain.cs
+++ b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
@@ -40,7 +40,7 @@
public string HSeOrderBillNo { get; set; }
public int? HGroupID;
public int? HWorkerID;
- public int? HWorkShopID;
+ public string HWorkShopID;
public int? HProdORGID;
public int? HEntrustORGID;
public int? HStockInORGID;
@@ -68,6 +68,9 @@
public string HOrderType { get; set; }
public string HMonthPlanFlag { get; set; }
public string HMastersDate { get; set; }
+ public DateTime? HMakeDate { get; set; }
public string sWheres { get; set; }
+
+ public string HVersion_Import { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1