锦州代码更改

Controller/SCP_ASK_CONTROLLER.cs

@@ -1431,7 +1431,6 @@ namespace CK.SCP.Controller
                         q = q.Where(p => p.AskBillNum==p_entity.AskBillNum);
                     }
 
-
                     _ret.State = ReturnStatus.Succeed;
                     _ret.Result = q;
                     p_action(_ret);

Controller/SCP_EXCEL_CONTROLLER.cs

@@ -205,9 +205,7 @@ namespace CK.SCP.Controller
                     _entity.要货数量 = itm.AskQty.ToString();
                     _entity.说明 = string.IsNullOrEmpty(itm.Remark)?string.Empty:itm.Remark.ToString();
                     _entity.到货日期 = itm.EndTime == null ? string.Empty : itm.EndTime.Value.ToString("yyyyMMdd");
-					_entity.预测一 = itm.Extend1.ToString();
-                    _entity.预测二= itm.Extend2.ToString();
-                    _entity.预测三 = itm.Extend3.ToString();
+                
                     _exportDetailList.Add(_entity);
 
                 });

Controller/SCP_RECEIVE_CONTROLLER.cs

@@ -652,7 +652,7 @@ namespace CK.SCP.Controller
                                 _item.ITEM_CONTENT = string.Format("收货单号{0}发货单号{1},已收货!请申请发票", p.RecvBillNum, _ls[0].AsnBillNum);
                                 _item.ITEM_TYPE = (int)PENDING_MESSAGE_TYPE.PO_AUDIT_PASS;
                                 _item.ITEM_STATE = (int)PENDING_STATE.WAITING;
-                                _item.SENDER = p.CreateUser;
+                                _item.SENDER = p.CreateUser == null ? userName : p.CreateUser;
                                 _item.VEND_ID = p.VendId;
                                 _item.SENDING_TIME = DateTime.Now;
                             //_item.ITEM_ADDRESS = p.Site_Desc;

Models/ScpEntity/ExcelExportEnttity/SCP_ASK_DETAIL_EXPORT.cs

@@ -20,9 +20,8 @@ namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity
          public string 要货数量 {get;set;}     //"AskQty"      
          public string 说明 { get; set; }      //"ReMark"      
          public string 到货日期 { get; set; }
-        public string 预测一 { get; set; }     //"OneMonth"      
-        public string 预测二 { get; set; }     //"TwoMonth"      
-        public string 预测三 { get; set; }     //"ThreeMonth"      
+        
+         
         
     }
 }

Models/UniApiEntity/xxscm_tx_mstr.cs

@@ -36,7 +36,7 @@ namespace CK.SCP.Models.UniApiEntity
         [StringLength(50)]
         public string xxscm_tx_domain { get; set; }
 
-        [Required(AllowEmptyStrings = true)]
+
         [StringLength(50)]
         public string xxscm_tx_site { get; set; }
 

SCP/Views/BasicData/SCP_FACTORY.aspx

@@ -11,7 +11,7 @@
 
      <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="0px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="0px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region" >
             <Items>
                 <f:Panel runat="server" ID="panelTopRegion" RegionPosition="Top" RegionSplit="true" EnableCollapse="true" 
                     Title="顶部面板" ShowBorder="true" ShowHeader="false" BodyPadding="0"  >
@@ -25,7 +25,7 @@
                                 
                                 <f:Button ID="Btn_Delete" runat="server" Text="删除" Icon="Delete" OnClick="Btn_Delete_Click">
                                 </f:Button>   
-                                <f:Button ID="Btn_Edit" runat="server" Text="编辑" Icon="BasketEdit" OnClick="Btn_Edit_Click">
+                                <f:Button ID="Btn_Edit" runat="server" Text="编辑" Icon="BasketEdit" OnClick="Btn_Edit_Click" >
                                 </f:Button>   
 
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">

SCP/Views/BasicData/SCP_FACTORY.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace SCP.BasicData {
+namespace SCP.BasicData
+{
 
 
-    public partial class SCP_FACTORY {
+    public partial class SCP_FACTORY
+    {
 
         /// <summary>
         /// form1 控件。

SCP/Views/BasicData/SCP_INFO.aspx.cs

@@ -161,6 +161,9 @@ namespace SCP.BasicData
             string roleID = GetSelectedDataKey(Grid1, 0);         
             string name = GetIdentityName();
              int id = Convert.ToInt32(roleID);
+            //int id = GetSelectedDataKeyID(Grid1);
+            //string varString = Convert.ToString(id);
+            //varString = Convert.ToString(roleID);
             V_INFO modelPublicData = SCP_INFO_CONTROLLER.GetInfoByBillNo(id);
             if (modelPublicData.UserName != name)
             {

SCP/Views/PlanData/SCP_ASK_DETAIL.aspx

@@ -109,9 +109,7 @@
                           <f:BoundField SortField="ReduceQty" DataField="ReduceQty" HeaderText="已减数量" ColumnID="ReceiveQty" Width="60px" Hidden="true" DataFormatString = "{0:F}" />
                           <f:BoundField SortField="ReceivedPort" DataField="ReceivedPort" HeaderText="库位" ColumnID="ReceivedPort"  />  
                           <f:BoundField DataField="UpdateInfo" HeaderText="备注"/>     
-                         <f:BoundField SortField="OneMonth" DataField="OneMonth" HeaderText="预测一" ColumnID="OneMonth"  />  
-                        <f:BoundField SortField="TwoMonth" DataField="TwoMonth" HeaderText="预测二" ColumnID="TwoMonth"  />  
-                        <f:BoundField SortField="ThreeMonth" DataField="ThreeMonth" HeaderText="预测三" ColumnID="ThreeMonth"  />  
+                       
                     </Columns> 
                 </f:Grid>
 

SCP/Views/PlanData/SCP_PO.aspx.cs

@@ -98,7 +98,6 @@ namespace SCP.PlanData
         protected void Grid_V_TB_PO_RowDoubleClick(object sender, FineUI.GridRowClickEventArgs e)
         {
             object[] rowDataKeys = Grid_V_TB_PO.DataKeys[e.RowIndex];
-
             string PoBillNum = rowDataKeys[1] as string;
             string VendID = rowDataKeys[3] as string;
             PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../PlanData/SCP_PO_DETAIL.aspx?PoBillNum={0}", PoBillNum)));

SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx

@@ -96,11 +96,11 @@
                 <f:Grid ID = "Grid_V_TB_PO_DETAIL"  EnableCollapse = "true" ShowBorder = "true" EnableMultiSelect="true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect = "true" 
                 DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty,ReceivedPort,SubSite,Extend1,Extend2,Extend3" 
                      SortField="PoLine" 
-                    OnSort="Grid_V_TB_PO_DETAIL_Sort"
+                
                      AllowSorting="true"
                      AllowPaging="True"
                      AllowCellEditing="true" ClicksToEdit="2"
-                     IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange" 
+                     IsDatabasePaging="true" PageSize="1000" 
                       OnRowDataBound="Grid_V_TB_PO_DETAIL_RowDataBound"
                        >
                        <PageItems>

SCP/Views/SupplierData/SCP_ASN.aspx

@@ -98,7 +98,7 @@
                         </f:ToolbarText>
                         <f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged"
                             runat="server">
-                            <f:ListItem Text="20" Value="10" />
+                            <f:ListItem Text="20" Value="20" />
                             <f:ListItem Text="40" Value="40" />
                             <f:ListItem Text="80" Value="80" />
                             <f:ListItem Text="100" Value="100" />                          

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx

@@ -64,11 +64,7 @@
                                        <f:TextBox runat = "server" Label = "发货单号" EmptyText = "" ID = "TXT_ASNBill"   />
                                        <f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName"   />
                                        <f:TextBox runat = "server" Label = "供应商编号" EmptyText = "" ID = "TXT_VendId"   />
-                                       <f:DropDownList runat="server" ID="DDL_State" Label="单据类型" Hidden="true">
-                                            <f:ListItem Text="-" Value=""/>
-                                            <f:ListItem Text="退货单" Value="退货单" />
-                                            <f:ListItem Text="收货单" Value="收货单" />                                           
-                                        </f:DropDownList>
+                                     
                                        </Items>
                                 </f:FormRow>
                                 
@@ -83,9 +79,15 @@
                                 <f:FormRow runat="server" ID="FormRow_3">
                                     <Items>
                                         <f:TextBox runat = "server" Label = "收(退)货单号" EmptyText = "" ID = "TXT_RECEIVE"   />
+                                         <f:DropDownList runat="server" ID="DDL_State"  Label="单据类型"  Text="单据类型">
+                                            <f:ListItem Text="-" Value=""/>
+                                            <f:ListItem Text="退货单" Value="退货单" />
+                                            <f:ListItem Text="收货单" Value="收货单" />                                           
+                                        </f:DropDownList>
                                          <f:Button runat="server" Text="关闭" ID="BtnClose" OnClick="BtnClose_Click"></f:Button>
                                         <f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找">
                                         </f:Button>                                     
+                                       
                                     </Items>
                                 </f:FormRow>
                             </Rows>
@@ -122,7 +124,7 @@
 
 
                 <f:Grid ID="Grid_V_TB_RECEIVE_LIST" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid" 
-                    runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True"  SortField="RecvBillNum"
+                    runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True"  SortField="BillType_DESC"
                     AutoScroll="True" OnPageIndexChange="Grid_V_TB_RECEIVE_LIST_PageIndexChange" EnableCheckBoxSelect = "true"  OnRowDataBound="Grid_V_TB_RECEIVE_LIST_RowDataBound" >
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace SCP.SupplierData {
+namespace SCP.SupplierData
+{
 
 
-    public partial class ReceiveList {
+    public partial class ReceiveList
+    {
 
         /// <summary>
         /// form1 控件。
@@ -192,15 +194,6 @@ namespace SCP.SupplierData {
         /// </remarks>
         protected global::FineUI.TextBox TXT_VendId;
 
-        /// <summary>
-        /// DDL_State 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.DropDownList DDL_State;
-        
         /// <summary>
         /// FormRow_2 控件。
         /// </summary>
@@ -264,6 +257,15 @@ namespace SCP.SupplierData {
         /// </remarks>
         protected global::FineUI.TextBox TXT_RECEIVE;
 
+        /// <summary>
+        /// DDL_State 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DropDownList DDL_State;
+
         /// <summary>
         /// BtnClose 控件。
         /// </summary>

SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs

@@ -308,7 +308,7 @@ namespace SCP.WarehouseData
             string VendName = txtSupplier.Text;
             string State = ddl.SelectedValue;
             string PartCode = TXT_PartCode.Text;
-            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../北京安通林/SCP_RECEIVE_DETAIL.aspx?ID={0}&&VendName={1}&&State={2}&&PartCode={3}", RecvBillNum, VendName, State, PartCode)));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&&VendName={1}&&State={2}&&PartCode={3}", RecvBillNum, VendName, State, PartCode)));
         }
 
         protected void btnReject_Click(object sender, EventArgs e)

SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx

@@ -22,7 +22,7 @@
                         <f:Toolbar ID="Toolbar2" runat="server">
                             <Items>
                                 <f:ToolbarSeparator runat="server" />
-                                <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Add" OnClientClick="location.reload();">
+                                <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
                                 </f:Button>
 
                                 <%--                                <f:Button ID="Button1" runat="server" EnablePostBack="True" Text="修改" Icon="Add">--%>

SCP/default.aspx

@@ -111,10 +111,10 @@
 
         for (var i = 0; obj.options.length; i++)
         {
-            if ('QDVALEO' == obj.options[i].value) {
+            if ('JZ1' == obj.options[i].value) {
                 obj.options[i].selected = true;
                 _factory = document.getElementById(_factoryValue);
-                _factory.value = 'QDVALEO';
+                _factory.value = 'JZ1';
             }
         }
   
@@ -231,6 +231,6 @@ function back_click() {
 //    }
 
 //}
-    </script> 
+</script> 
 </body>
 </html>

UniApiGroup/Controller/OdbcApiScpController.cs

@@ -84,7 +84,7 @@ namespace CK.SCP.GrupUniApi.Controller
                     {
                         xxscm_tx_seq = seq,
                         xxscm_tx_nbr = wmsData.BillNum,
-                        xxscm_tx_site =wmsData.Site,
+                
                         xxscm_tx_part = wmsData.PartCode,
                         xxscm_tx_qadread = ((int)UniApiState.待执行).ToString(),
                         xxscm_tx_wmsread = ((int)UniApiState.待执行).ToString(),
@@ -115,6 +115,7 @@ namespace CK.SCP.GrupUniApi.Controller
                         xxscm_tx_ware_class = "",
                         xxscm_tx_batch = wmsData.Batch,
                         xxscm_tx_produce_date = wmsData.ValidDate,
+                        xxscm_tx_site = (!string.IsNullOrEmpty(wmsData.Site)) ? wmsData.Site : wmsData.Domain
                     };
                     //PutScpCtrl(idb, qadData.xxscm_tx_seq, tableName,1,wmsData.Domain,wmsData.Site );
                     qadDataList.Add(qadData);