合并代码

Controller/SCP_TS_BARCODE_CONTROLLER.cs

@@ -107,7 +107,6 @@ namespace CK.SCP.Controller
                     {
                         q = q.Where(p => p.PartName.Contains(p_entity.PartName));
                     }
-                    
                     _ret.State = ReturnStatus.Succeed;
                     _ret.Result = q;
                     p_action(_ret);
@@ -175,7 +174,6 @@ namespace CK.SCP.Controller
                     {
                         q = q.Where(p => p.PartCode.Contains(p_entity.PartCode));
                     }
-
                     if (!string.IsNullOrEmpty(p_entity.Batch))
                     {
                         q = q.Where(p => p.Batch.Contains(p_entity.Batch));

Models/ScpEntity/TA_VENDER.cs

@@ -65,6 +65,7 @@ namespace CK.SCP.Models.ScpEntity
         public string Site { get; set; }
 
         public int? ReceiveTimeScope { set; get; }
+        public decimal? Quota { set; get; }
         [NotMapped]
         public string FactoryName => ScpCache.GetFactoryNameByCode(Site);
     }

Models/ScpEntity/TB_PRICE.cs

@@ -27,5 +27,7 @@ namespace CK.SCP.Models.ScpEntity
         public string Extend1 { get; set; }
         public string Extend2 { get; set; }
         public string Extend3 { get; set; }
+        public int State { get; set; }
+        public decimal? VendAmt { get; set; }
     }
 }

Models/UniApiEntity/xxscm_inv_det.cs

@@ -99,6 +99,12 @@ namespace CK.SCP.Models.UniApiEntity
         public decimal xxscm_inv_tottaxvar { get; set; }
 
         public decimal  xxscm_inv_totdiscount { get; set; }
+
+
+        public decimal xxscm_inv_totclaim { get; set; }
+
+
+
         public string xxscm_inv_project { get; set; }
 
         public decimal xxscm_inv_extend1 { get; set; }

UniApiGroup/Controller/OdbcApiScpController.cs

@@ -326,9 +326,10 @@ namespace CK.SCP.GrupUniApi.Controller
                                                 qadData.xxscm_inv_date = _invoice.UpdateTime == null ? _invoice.CreateTime.Value.AddDays(1) : _invoice.UpdateTime.Value;
                                                 qadData.xxscm_inv_totamt = _invoice.Amount.Value;
                                                 qadData.xxscm_inv_tottax = _invoice.Total.Value;
-                                                qadData.xxscm_inv_totdiscount = _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value;
+                                                qadData.xxscm_inv_totdiscount = _invoice.DiscountPrice == null ? 0 : _invoice.DiscountPrice.Value;
                                                 qadData.xxscm_inv_tottaxvar = _invoice.BlancePrice == null ? 0 : _invoice.BlancePrice.Value;
-                                                qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : _invoice.Extend1.Value;
+                                                qadData.xxscm_inv_totclaim= _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value;
+                                                qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : q_invoice.Extend1.Value;
                                                 qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value;
                                                 qadDataList.Add(qadData);
                                                 p.State = (int)BillState.Finish;