接口变更

Models/ScpEntity/TB_ASK_DETAIL.cs

@@ -48,6 +48,9 @@ namespace CK.SCP.Models.ScpEntity
 
 
         public decimal? ReduceQty { get; set; }
+
+        public string Site { get; set; }
+
         public string Extend1 { get; set; }
         public string Extend2 { get; set; }
         public string Extend3 { get; set; }

SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs

@@ -256,8 +256,6 @@ namespace SCP.SupplierData
         {
           
         }
-
-
         private List<V_TB_ASN_DETAIL> GetSelectedList()
         {
             List<V_TB_ASN_DETAIL> _list = new List<V_TB_ASN_DETAIL>();

UniApiGroup/Controller/OdbcApiQadController.cs

@@ -381,6 +381,7 @@ namespace CK.SCP.GrupUniApi.Controller
                 scpRcv.PoBillNum = firstqadData.xxqad_prh_po_nbr;//采购单
                //发货单号
                 scpRcv.Site = firstqadData.xxqad_prh_domain;//地点
+                scpRcv.SubSite = firstqadData.xxqad_prh_site;
                 scpRcv.VendId = firstqadData.xxqad_prh_vend;//供货商名称
                 scpRcv.ShipTime = firstqadData.xxqad_prh_date_ship;//收货日期
                 scpRcv.ErpRecvBillNum = firstqadData.xxqad_prh_receiver;
@@ -445,6 +446,7 @@ namespace CK.SCP.GrupUniApi.Controller
                         scpRcvDetail.StdCost = qadData.xxqad_prh_std_cost != null ? qadData.xxqad_prh_std_cost.Value : 0;
                         scpRcvDetail.Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1;
                         scpRcvDetail.Site = qadData.xxqad_prh_domain;
+                        scpRcvDetail.SubSite = qadData.xxqad_prh_site;
                         scpRcvDetail.Tax = firstqadData.xxqad_prh_taxc;
                         if (scpRcveDetailList.Count(p =>
                                       p.RecvBillNum == scpRcvDetail.RecvBillNum &&
@@ -536,6 +538,7 @@ namespace CK.SCP.GrupUniApi.Controller
                 }
                 scpRcv.PoBillNum = firstqadData.xxqad_prh_po_nbr;//采购单                                                //发货单号
                 scpRcv.Site = firstqadData.xxqad_prh_domain;//地点
+                scpRcv.SubSite = firstqadData.xxqad_prh_site;//地点
                 scpRcv.VendId = firstqadData.xxqad_prh_vend;//供货商名称
                 scpRcv.ShipTime = firstqadData.xxqad_prh_date_ship;//收货日期
                 scpRcv.ErpRecvBillNum = firstqadData.xxqad_prh_receiver;
@@ -552,7 +555,6 @@ namespace CK.SCP.GrupUniApi.Controller
                                      p.PoBillNum == qadData.xxqad_prh_po_nbr &&
                                      p.PoLine == poLineNum &&
                                      p.PartCode == qadData.xxqad_prh_part
-
                                      && p.Site==qadData.xxqad_prh_domain
 
                                      );
@@ -583,6 +585,7 @@ namespace CK.SCP.GrupUniApi.Controller
                                 StdCost = qadData.xxqad_prh_std_cost != null ? qadData.xxqad_prh_std_cost.Value : 0,
                                 Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1,
                                 Site = qadData.xxqad_prh_domain,
+                                SubSite=qadData.xxqad_prh_site,
                                 Tax = firstqadData.xxqad_prh_taxc
                             };
                            
@@ -593,6 +596,7 @@ namespace CK.SCP.GrupUniApi.Controller
                         scpRcvDetail.Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1;
                         scpRcvDetail.CurAmt = qadData.xxqad_prh_curr_amt != null ? qadData.xxqad_prh_curr_amt.Value : 0;
                         scpRcvDetail.Site = qadData.xxqad_prh_domain;
+                        scpRcvDetail.SubSite = qadData.xxqad_prh_domain;
 
                         scpRcveDetailList.Add(scpRcvDetail);
                         qadData.xxqad_prh_scmread = ((int)UniApiState.成功).ToString();
@@ -816,6 +820,7 @@ namespace CK.SCP.GrupUniApi.Controller
                 wmsPo.BuyerPhone = firstqadData.xxqad_pod_buyer_phone;
                 wmsPo.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期
                 wmsPo.UpdateUser = firstqadData.xxqad_pod_updateur;//更新用户
+                wmsPo.SubSite = firstqadData.xxqad_pod_site;
 
                 foreach (var qadData in qadDataList)
                 {
@@ -844,15 +849,14 @@ namespace CK.SCP.GrupUniApi.Controller
                         wmsPoDetail.PoUnit = qadData.xxqad_pod_um;//采购单位
                         wmsPoDetail.LocUnit = qadData.xxqad_pod_loc_um.ToUpper();//存储单位
                         wmsPoDetail.DockCode = qadData.xxqad_pod_loc;
-                        wmsPoDetail.Price = ScpCache.Config.项目名称 == ProjectName.重庆北汽模塑.ToString()
+                        wmsPoDetail.Price = ScpCache.Config.项目名称 == ProjectName.重庆北汽模塑.ToString()? 0: qadData.xxqad_pod_price;
-                            ? 0
-                            : qadData.xxqad_pod_price;
                         wmsPoDetail.Currency = qadData.xxqad_pod_curr;//币种
                         wmsPoDetail.PackQty = qadData.xxqad_pod_qty_std;//标包数量
                         wmsPoDetail.UnConv = qadData.xxqad_pod_um_conv;//转换率
                         wmsPoDetail.DockCode = qadData.xxqad_pod_loc;                  
                         wmsPoDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态
-                        wmsPoDetail.Remark = qadData.xxqad_pod_domain;//备注
+                        wmsPoDetail.Site = qadData.xxqad_pod_domain;//备注
+                        wmsPoDetail.SubSite = qadData.xxqad_pod_site;
                         wmsPoDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期
                         wmsPoDetail.CreateUser = firstqadData.xxqad_pod_createur;//创建用户
                         wmsPoDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期
@@ -1015,6 +1019,7 @@ namespace CK.SCP.GrupUniApi.Controller
                                             VendId = firstqadData.xxqad_pod_vend.ToUpper(),//供应商编号
                                             Buyer = firstqadData.xxqad_pod_attn,//联系人
                                             Site = firstqadData.xxqad_pod_domain,//地点
+                                            SubSite=firstqadData.xxqad_pod_site,
                                             State = (int)AskState.New,//状态
                                             CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt,//创建日期
                                             CreateUser = firstqadData.xxqad_pod_buyer,//创建用户
@@ -1069,7 +1074,8 @@ namespace CK.SCP.GrupUniApi.Controller
                                                 _taskDetail.UnConv = qadData.xxqad_pod_um_conv;//转换率
                                                 _taskDetail.DockCode = qadData.xxqad_pod_loc;
                                                 _taskDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态
-                                                _taskDetail.Remark = qadData.xxqad_pod_domain;//备注
+                                                _taskDetail.SubSite = qadData.xxqad_pod_site;//备注
+                                                _taskDetail.Site = qadData.xxqad_pod_domain;
                                                 _taskDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期
                                                 _taskDetail.CreateUser = firstqadData.xxqad_pod_buyer;//创建用户
                                                 _taskDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期

UniApiGroup/Controller/OdbcApiScpController.cs

@@ -240,6 +240,7 @@ namespace CK.SCP.GrupUniApi.Controller
                         xxscm_tx_batch = wmsData.VendBatch,
                         xxscm_tx_boxcode = wmsData.Barcode,
                         xxscm_tx_qty_real = wmsData.Qty,
+                     
                     };
                     qadDataList.Add(qadData);
                 }

UniApiGroup/Controller/OdbcApiWmsController.cs

@@ -9,6 +9,7 @@ using CK.SCP.Models.UniApiEntity;
 using CK.SCP.Utils;
 using System.Text;
 using System.Data.Entity.Core;
+using CK.SCP.Models.ScpEntity.ExcelExportEnttity;
 
 namespace CK.SCP.GrupUniApi.Controller
 {
@@ -271,6 +272,7 @@ namespace CK.SCP.GrupUniApi.Controller
                 scpRcv.Site = firstqadData.xxwms_rc_domain;//地点
                 scpRcv.VendId = firstqadData.xxwms_rc_vend;//供货商名称
                 scpRcv.ShipTime = firstqadData.xxwms_rc_date_ship;//收货日期
+                scpRcv.SubSite = !string.IsNullOrEmpty(firstqadData.xxwms_rc_site)? firstqadData.xxwms_rc_site: firstqadData.xxwms_rc_domain;
 
                 //var scpAsn = wdb.TF_ASN.FirstOrDefault(p => p.BillNum == scpRcv.AsnBillNum);
                 var scpAsn = wdb.TB_ASN.Where(p => p.AsnBillNum== scpRcv.AsnBillNum && p.IsDeleted==false).ToList();//发货单主表订单号==收货单主表发货单号
@@ -328,7 +330,8 @@ namespace CK.SCP.GrupUniApi.Controller
                                 Qty = qadData.xxwms_rc_qty_total,//收货总量
                                 //DockCode = ?,//收货口
                                 State = istate,// (int)FormState.关闭,
-                                Remark = firstqadData.xxwms_rc_domain,
+                                Site = firstqadData.xxwms_rc_domain,
+                                SubSite = !string.IsNullOrEmpty(firstqadData.xxwms_rc_site) ? firstqadData.xxwms_rc_site : firstqadData.xxwms_rc_domain,
                                 CreateTime = qadData.xxwms_rc_createdt == null ? DateTime.Now : (DateTime)qadData.xxwms_rc_createdt,//创建日期
                                 CreateUser = qadData.xxwms_rc_createur,//创建用户
                                 IsDeleted = false,
@@ -560,6 +563,7 @@ namespace CK.SCP.GrupUniApi.Controller
                 scpRcv.Site = firstqadData.xxwms_rt_domain;//地点
                 scpRcv.VendId = firstqadData.xxwms_rt_vend;//供货商名称
                 scpRcv.ShipTime = firstqadData.xxwms_rt_date_ship;//收货日期
+                scpRcv.SubSite = !string.IsNullOrEmpty(firstqadData.xxwms_rt_site)? firstqadData.xxwms_rt_site: firstqadData.xxwms_rt_domain;
                 //var scpAsn = wdb.TF_ASN.FirstOrDefault(p => p.BillNum == scpRcv.AsnBillNum);
                 var scpAsn = wdb.TB_ASN.FirstOrDefault(p => p.PoBillNum == scpRcv.AsnBillNum);//发货单主表订单号==退货单主表发货单号
                 if (scpAsn != null)
@@ -600,7 +604,8 @@ namespace CK.SCP.GrupUniApi.Controller
                                 LocUnit = qadData.xxwms_rt_loc_um,//基本单位
                                 Qty = qadData.xxwms_rt_qty_total,//退货总量
                                 State = istate,// (int)FormState.关闭,
-                                Remark = firstqadData.xxwms_rt_domain,
+                                Site = firstqadData.xxwms_rt_domain,
+                                SubSite=firstqadData.xxwms_rt_site,
                                 CreateTime = qadData.xxwms_rt_createdt == null ? DateTime.Now : (DateTime)qadData.xxwms_rt_createdt,//创建日期
                                 CreateUser = qadData.xxwms_rt_createur,//创建用户
                                 IsDeleted = false,