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/StationBill.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index b7f91d3..a256942 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -52,6 +52,10 @@
public long lngBillKey { get; set; }
public long lngBillSubKey { get; set; }
public DateTime HStationOutTime { get; set; }
+
+ public string HRelBeginTime { get; set; }
+
+ public string HRelEndTime { get; set; }
public long HPayProcID { get; set; }
public long HSourceID2 { get; set; }
public long HSourceID3 { get; set; }
@@ -93,5 +97,7 @@
public string HMaterToSourceBillNo { get; set; }
public int HMouldID { get; set; }
public string HDate { get; set; }
+ public double HMachineWorkTimes { get; set; }
+ public int HIsTimeFlag { get; set; } = 0;
}
}
\ No newline at end of file
--
Gitblit v1.9.1