From 38b01cb446b0725ded3ae8867353925e67da3ac1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 18 六月 2024 19:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/StationBill.cs |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index ca50c72..9b047c6 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -14,6 +14,7 @@
         public string HInnerBillNo { get; set; }
         public string HICMOBillNo { get; set; }
         public long HICMOInterID { get; set; }
+        public long HICMOEntryID { get; set; }
         public long HProcExchInterID { get; set; }
         public long HProcExchEntryID { get; set; }
         public string HProcExchBillNo { get; set; }
@@ -33,7 +34,7 @@
         public double HMoney { get; set; }
         public string HRemark { get; set; }
         public double HTaxRate { get; set; }
-        public long HProcNo { get; set; }
+        public string HProcNo { get; set; }
         public string HOrderProcNO { get; set; }
         public long HWWWorkOrderInterID { get; set; }
         public long HWWWorkOrderEntryID { get; set; }
@@ -70,8 +71,20 @@
         public long HQCCheckID { get; set; }
         public long HProcPlanInterID { get; set; }
         public long HProcPlanEntryID { get; set; }
-
         public string eventType { get; set; }
+        public long HMainInterID { get; set; }
+        public long HPRDOrgID { get; set; }
+        public double HmaterOutqty { get; set; }
+        public double HProcPriceRate { get; set; }
+        public int HTemporaryAreaID { get; set; }
 
+        public long HMainSourceInterID { get; set; }
+        public long HMainSourceEntryID { get; set; }
+        public string HMainSourceBillNo { get; set; }
+
+        public double HWasterQty_Work { get; set; }
+        public double HWasterQty_Mater { get; set; }
+        public double HBackWorkQty { get; set; }
+        public Int64 HShiftsID { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1