Merge branch 'master' of https://gitee.com/zxyabc/COMONE

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; }
     }
 }

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; }
     }
 }

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; }
 
     }
 }

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; }
 
 
 

Models/UniApiEntity/xxscm_tx_mstr.cs

@@ -97,7 +97,8 @@ namespace CK.SCP.Models.UniApiEntity
 
         [StringLength(50)]
         public string xxscm_tx_status { get; set; }
- 
+    
+
 
 
     }

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; }
     }
 }

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;