From 0c31fd296f5215b36863a0760de6d727ac573119 Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Mon, 19 Oct 2020 08:28:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=A6=E5=B7=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx
index a96b085..e9125c4 100644
--- a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx
+++ b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx
@@ -124,7 +124,7 @@
                         </f:TemplateField>
                         <f:BoundField runat="server" HeaderText="实际税前金额" ColumnID="" DataField="Extend1" DataFormatString="{0:F}" />
                         <f:BoundField runat="server" HeaderText="实际税额" ColumnID="" DataField="Extend2" DataFormatString="{0:F}" />
-                        <f:BoundField runat="server" HeaderText="折扣金额" ColumnID="" DataField="ContractPrice" DataFormatString="{0:F}" />
+                        <f:BoundField runat="server" HeaderText="折扣金额" ColumnID="" DataField="DiscountPrice" DataFormatString="{0:F}" />
                         <f:BoundField runat="server" HeaderText="调整税额" ColumnID="" DataField="BlancePrice" DataFormatString="{0:F}" Hidden="true" />
                         <f:BoundField runat="server" HeaderText="开票金额" ColumnID="" DataField="RealTotal" DataFormatString="{0:F}" />
                         <f:BoundField runat="server" HeaderText="备注" ColumnID="" DataField="Remark" />

From 136974c8fe9a2e1698a41ad56838e0cf13d4b006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 20 Oct 2020 10:59:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Models/UniApiEntity/xxbom_pt_mstr.cs           |  1 +
 Models/UniApiEntity/xxqad_ctrl.cs              | 16 ++++++++--------
 Models/UniApiEntity/xxqad_pod_det.cs           |  9 +++++++--
 Models/UniApiEntity/xxqad_vp_mstr.cs           |  3 ++-
 Models/UniApiEntity/xxscm_tx_mstr.cs           |  3 ++-
 Models/UniApiEntity/xxwms_rct_det.cs           |  3 +++
 UniApiGroup/Controller/OdbcApiQadController.cs |  6 ------
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Models/UniApiEntity/xxbom_pt_mstr.cs b/Models/UniApiEntity/xxbom_pt_mstr.cs
index c8c016f..1c2a5d5 100644
--- a/Models/UniApiEntity/xxbom_pt_mstr.cs
+++ b/Models/UniApiEntity/xxbom_pt_mstr.cs
@@ -150,5 +150,6 @@ namespace CK.SCP.Models.UniApiEntity
 
         [StringLength(8)]
         public string xxbom_pt_domain { get; set; }
+        public string xxqad_pt_draw { get; set; }
     }
 }
diff --git a/Models/UniApiEntity/xxqad_ctrl.cs b/Models/UniApiEntity/xxqad_ctrl.cs
index 57ba9c8..7dd46f8 100644
--- a/Models/UniApiEntity/xxqad_ctrl.cs
+++ b/Models/UniApiEntity/xxqad_ctrl.cs
@@ -33,13 +33,13 @@ namespace CK.SCP.Models.UniApiEntity
 
         public string xxqad_rmks { get; set; }
 
-//        public DateTime xxqad_create_time { get; set; }
-//
-//                [Required(AllowEmptyStrings = true)]
-//        [StringLength(20)]
-//        public string xxqad_domain { get; set; }
-
-        //[StringLength(8)]
-        //public string xxqad_site { get; set; }
+        public DateTime xxqad_create_time { get; set; }
+
+        [Required(AllowEmptyStrings = true)]
+        [StringLength(20)]
+        public string xxqad_domain { get; set; }
+
+        [StringLength(8)]
+        public string xxqad_site { get; set; }
     }
 }
diff --git a/Models/UniApiEntity/xxqad_pod_det.cs b/Models/UniApiEntity/xxqad_pod_det.cs
index f88e06b..a5c4013 100644
--- a/Models/UniApiEntity/xxqad_pod_det.cs
+++ b/Models/UniApiEntity/xxqad_pod_det.cs
@@ -125,10 +125,15 @@ namespace CK.SCP.Models.UniApiEntity
         public string xxqad_pod_wolot { get; set; }
         */
         public string xxqad_pod_loc { get; set; }
-
+        public string xxqad_pod_type { get; set; }
+        public string xxqad_pod_wolot { get; set; }
+        public string xxqad_pod_pllist { get; set; }
 
         public string xxqad_pod_prj { get; set; }
-    
+        public Nullable<decimal> xxqad_pod_qty_rcvd { get; set; }
+        public Nullable<decimal> xxqad_pod_qty_open { get; set; }
+        public Nullable<System.DateTime> xxqad_pod_ord_date { get; set; }
+        public Nullable<System.DateTime> xxqad_pod_dur_date { get; set; }
 
     }
 }
diff --git a/Models/UniApiEntity/xxqad_vp_mstr.cs b/Models/UniApiEntity/xxqad_vp_mstr.cs
index 08ed54c..d3fc26d 100644
--- a/Models/UniApiEntity/xxqad_vp_mstr.cs
+++ b/Models/UniApiEntity/xxqad_vp_mstr.cs
@@ -80,7 +80,8 @@ namespace CK.SCP.Models.UniApiEntity
         public string xxqad_vp_updateur { get; set; }
 
         public int? xxqad_vp_vend_lead { get; set; }
-
+        public string xxqad_vp_consignment { get; set; }
+        public string xxqad_vp_price_comfirm { get; set; }
 
 
 
diff --git a/Models/UniApiEntity/xxscm_tx_mstr.cs b/Models/UniApiEntity/xxscm_tx_mstr.cs
index e7fe63e..c9f8d4d 100644
--- a/Models/UniApiEntity/xxscm_tx_mstr.cs
+++ b/Models/UniApiEntity/xxscm_tx_mstr.cs
@@ -97,7 +97,8 @@ namespace CK.SCP.Models.UniApiEntity
 
         [StringLength(50)]
         public string xxscm_tx_status { get; set; }
- 
+    
+
 
 
     }
diff --git a/Models/UniApiEntity/xxwms_rct_det.cs b/Models/UniApiEntity/xxwms_rct_det.cs
index 7336e4d..16bf415 100644
--- a/Models/UniApiEntity/xxwms_rct_det.cs
+++ b/Models/UniApiEntity/xxwms_rct_det.cs
@@ -75,5 +75,8 @@ namespace CK.SCP.Models.UniApiEntity
 
         [StringLength(8)]
         public string xxwms_rct_project { get; set; }
+        public string xxwms_rct_costcenter { get; set; }
+        public string xxwms_rct_manual { get; set; }
+        public string xxwms_rct_origin_loc { get; set; }
     }
 }
diff --git a/UniApiGroup/Controller/OdbcApiQadController.cs b/UniApiGroup/Controller/OdbcApiQadController.cs
index 03d0752..185e203 100644
--- a/UniApiGroup/Controller/OdbcApiQadController.cs
+++ b/UniApiGroup/Controller/OdbcApiQadController.cs
@@ -19,10 +19,6 @@ using System.Configuration;
 namespace CK.SCP.GrupUniApi.Controller
 {
 
-
-
-
-
     public class TP_TB_PO_PLAN
     {
 
@@ -78,8 +74,6 @@ namespace CK.SCP.GrupUniApi.Controller
                                 EntitiesFactory.SaveDb(authdb);
                                 UpdateVenderExtend(qadDataList, wdb, authdb);
                                 EntitiesFactory.SaveDb(authdb);
-
-
                             }
                             else
                                 continue;