From 096f0a528fc003ad60d50155af11a40d14b9f0d9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十二月 2023 13:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/StationBill.cs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index a42176b..b75c16a 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; }
@@ -73,5 +74,8 @@
         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; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1