CY_ECommercePlatform/AbstractFactory/Factory.cs

@@ -288,6 +288,7 @@
            OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderItemDAL, "CoreDeliverOrderItemDAL");
            OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderDAL, "CoreDeliverOrderDAL");
            OBJECT_PATH.Add(DALInterface.IEC_MergerForumsDAL, "EC_MergerForumsDAL");
            OBJECT_PATH.Add(DALInterface.IOA_ShebeijijianDAL, "OA_ShebeijijianDAL"); 
            #endregion

            #region Pay
@@ -1017,6 +1018,9 @@
        /// </summary>
        IEC_MergerForumsDAL = 1955,


        IOA_ShebeijijianDAL = 1956,

        /// <summary>
        /// 开票申请
        /// </summary>

 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj

@@ -195,6 +195,7 @@
    <Compile Include="OA\OA_ShebeiManageBLL.cs" />
    <Compile Include="OA\OA_PropertyManageBLL.cs" />
    <Compile Include="OA\OA_PropertyRecordBLL.cs" />
    <Compile Include="OA\OA_ShebeijijianBLL.cs" />
    <Compile Include="OA\OA_ShejijijianBLL.cs" />
    <Compile Include="OA\OA_ShiJuanBiaoQianBLL.cs" />
    <Compile Include="OA\OA_StaffBLL.cs" />

 CY_ECommercePlatform/CY.BLL/OA/OA_InventoryBLL.cs

@@ -102,6 +102,25 @@
            return inventoryDAL.SelecetModelDetailInfoList(pa, FirmId, WarehouseName, GoodsName, CommodityName, BrandName, SpecificationName);
        }


        /// <summary>
        /// 获取库存货品的详细信息
        /// </summary>
        /// <param name="pa"></param>
        /// <param name="FirmId"></param>
        /// <param name="CargoSpaceName"></param>
        /// <param name="WarehouseName"></param>
        /// <param name="GoodsName"></param>
        /// <param name="CommodityName"></param>
        /// <param name="BrandName"></param>
        /// <param name="SpecificationName"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList(Guid FirmId, string WarehouseName, string GoodsName, string CommodityName, string BrandName, string SpecificationName)
        {

            return inventoryDAL.SelecetModelDetailInfoList( FirmId, WarehouseName, GoodsName, CommodityName, BrandName, SpecificationName);
        }

        /// <summary>
        /// 获取单个库存信息
        /// </summary>

 CY_ECommercePlatform/CY.BLL/OA/OA_ShebeijijianBLL.cs

New file
@@ -0,0 +1,181 @@

/**  
* OA_ShebeijijianBLL.cs
*
* 功 能： 合作客户业务逻辑类
* 类 名： OA_ShebeijijianBLL
*
* Ver    变更日期             负责人  变更内容
* ───────────────────────────────────
* V0.01  2013-4-2 15:11       吴辉      初版
* V0.02  2013-5-29 17:43      吴崎均    增加转换在线会员为厂商客户方法 
*
*
*
*
*
*
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using CY.Model;
using AbstractFactory;
using CY.IBaseDAL;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;

namespace CY.BLL
{
    public class OA_ShebeijijianBLL
    {

        IOA_ShebeijijianDAL _IOA_ShebeijijianDAL = null;

        /// <summary>
        /// 初始化构造
        /// </summary>
        public OA_ShebeijijianBLL()
        {
            //获取OA_Shebeijijian DAL实现
            _IOA_ShebeijijianDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_ShebeijijianDAL) as IOA_ShebeijijianDAL;


        }

        /// <summary>
        /// 新增送货安排
        /// </summary>
        /// <param name="rType"></param>
        /// <param name="m_OA_CustomerCommunications"></param>
        /// <param name="m_EC_AcceptWayByCustomers"></param>
        /// <returns></returns>
        public bool InsertModel(CY.Model.OA_Shebeijijian m_OA_Shebeijijian)
        {
            try
            {

                return _IOA_ShebeijijianDAL.InserModel(m_OA_Shebeijijian);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 修改送货安排
        /// </summary>
        /// <param name="rType"></param>
        /// <returns></returns>
        public bool UpdateModel(CY.Model.OA_Shebeijijian m_OA_Shebeijijian)
        {
            try
            {
                return _IOA_ShebeijijianDAL.UpdateModel(m_OA_Shebeijijian);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 获取全部合作客户
        /// </summary>
        /// <param name="Keyid">主键id</param>
        /// <returns></returns>
        public IEnumerable<OA_Shebeijijian> GetModelList()
        {
            Query query = new Query();
            return _IOA_ShebeijijianDAL.SelectAllModel(query);
        }


        /// <summary>
        /// 根据formid获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Shebeijijian> GetModelByformid(Guid formid, string ShebeiId)
        {

            return _IOA_ShebeijijianDAL.GetModelByformid(formid, ShebeiId);
        }

        /// <summary>
        /// 获取全部合作客户
        /// </summary>
        /// <param name="Keyid">主键id</param>
        /// <returns></returns>
        public OA_Shebeijijian GetModelByKeyid(int keyid)
        {

            return _IOA_ShebeijijianDAL.GetModelByKeyid(keyid);
        }

        /// <summary>
        /// 删除合作客户
        /// </summary>
        /// <param name="rType"></param>
        /// <returns></returns>
        public bool DeleteModel(CY.Model.OA_Shebeijijian rType)
        {
            try
            {
                _IOA_ShebeijijianDAL.DeleteModel(rType);
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }

        /// <summary>
        /// 查询合作客户分页列表
        /// </summary>
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<OA_Shebeijijian> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
    string ShebeiId)
        {
            string Condition = " and ok.FirmId ='" + FirmId + "'  ";

            if (!string.IsNullOrEmpty(CreateTimeStart))
                Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeStart + "')<=0 ";

            if (!string.IsNullOrEmpty(CreateTimeEnd))
                Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeEnd + "')>=0 ";

            if (!string.IsNullOrEmpty(ShebeiId))
                Condition += " and  ok.ShebeiId = " + ShebeiId + "";

            
            Query query = new Query();
            IList<Criterion> criterias = new List<Criterion>()
            {
                new Criterion("", Condition),

                new Criterion("orderBy"," CreateTime desc   ")
            };
            query.Criteria = criterias;
            return _IOA_ShebeijijianDAL.SelectModelPage(query, pa);
        }


        /// <summary>
        /// 批量删除
        /// </summary>
        /// <param name="keyids"></param>
        /// <param name="Memberid"></param>
        /// <returns></returns>
        public bool DelAllModel(string keyids, Guid Memberid)
        {
            return _IOA_ShebeijijianDAL.DelAllModel(keyids, Memberid);
        }

    }
}

 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj

@@ -184,6 +184,7 @@
    <Compile Include="OA\IOA_GongzuozhizeDAL.cs" />
    <Compile Include="OA\IOA_ShebeiWeixiuDAL.cs" />
    <Compile Include="OA\IOA_ShebeiManageDAL.cs" />
    <Compile Include="OA\IOA_ShebeijijianDAL.cs" />
    <Compile Include="OA\IOA_ShejijijianDAL.cs" />
    <Compile Include="OA\IOA_ShiJuanBiaoQianDAL.cs" />
    <Compile Include="OA\IOA_WageAwardPunishDAL.cs" />

 CY_ECommercePlatform/CY.IDAL/OA/IOA_InventoryDAL.cs

@@ -43,6 +43,21 @@
        /// <returns></returns>
        IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList(Pagination pa, Guid FirmId, string WarehouseName,string GoodsName, string CommodityName, string BrandName, string SpecificationName);


        /// <summary>
        /// 获取库存货品的详细信息
        /// </summary>
        /// <param name="pa"></param>
        /// <param name="FirmId"></param>
        /// <param name="CargoSpaceName"></param>
        /// <param name="WarehouseName"></param>
        /// <param name="GoodsName"></param>
        /// <param name="CommodityName"></param>
        /// <param name="BrandName"></param>
        /// <param name="SpecificationName"></param>
        /// <returns></returns>
        IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList( Guid FirmId, string WarehouseName, string GoodsName, string CommodityName, string BrandName, string SpecificationName);

        /// <summary>
        /// 获取单个库存信息
        /// </summary>

 CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeijijianDAL.cs

New file
@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Data;
using System.Data.SqlClient;
using CY.IBaseDAL;
using CY.Model;


namespace CY.IDAL
{
    public interface IOA_ShebeijijianDAL : ICommonDAL, IPaging<OA_Shebeijijian>, IGetAllModel<OA_Shebeijijian>
    {

        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        OA_Shebeijijian GetModelByKeyid(int keyid);

        /// <summary>
        /// 根据formid获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        IEnumerable<OA_Shebeijijian> GetModelByformid(Guid formid, string ShebeiId);

        /// <summary>
        /// 批量删除
        /// </summary>
        /// <param name="keyids"></param>
        /// <param name="Memberid"></param>
        /// <returns></returns>
        bool DelAllModel(string keyids, Guid Memberid);



    }
}

 CY_ECommercePlatform/CY.Model/CY.Model.csproj

@@ -260,6 +260,7 @@
    <Compile Include="OA\OA_OutOfStorage.cs" />
    <Compile Include="OA\OA_Procurement.cs" />
    <Compile Include="OA\OA_GongzuoneirongCate.cs" />
    <Compile Include="OA\OA_Sehbeijijian.cs" />
    <Compile Include="OA\OA_ShebeiCate.cs" />
    <Compile Include="OA\OA_PropertyCate.cs" />
    <Compile Include="OA\OA_Gongzuozhize.cs" />

 CY_ECommercePlatform/CY.Model/OA/OA_OutOfStorage.cs

@@ -393,6 +393,16 @@
        }


        /// <summary>
        /// 货位名字
        /// </summary>
        public int? InventoryId
        {
            set;
            get;
        }


        #endregion Model

        #region Visiter

 CY_ECommercePlatform/CY.Model/OA/OA_Sehbeijijian.cs

New file
@@ -0,0 +1,179 @@
/**  
* OA_CorporateClients.cs
*
* 功 能： N/A
* 类 名： OA_CorporateClients
*
* Ver    变更日期             负责人  变更内容
* ───────────────────────────────────
* V0.01  2013-4-2 14:27:43   N/A    初版
*
*
*
*
*
*
*/

using System;
using CY.Infrastructure.Domain;
using CY.Infrastructure.Common;

namespace CY.Model
{
    /// <summary>
    /// 印刷参数
    /// </summary>
    [Serializable]
    public partial class OA_Shebeijijian : IAggregateRoot
    {

        public OA_Shebeijijian()
        {
        }
        #region Model
        /// <summary>
        /// id
        /// </summary>
        public int Keyid { get; set; }
        /// <summary>
        ///  FirmId
        /// </summary>
        public Guid FirmId { get; set; }
        /// <summary>
        /// 设备id
        /// </summary>
        public int? Shebeiid { get; set; }

        /// <summary>
        ///设备名称
        /// </summary>
        public string ShebeiName { get; set; }

        /// <summary>
        /// 计件工价
        /// </summary>
        public string Jijianmoney { get; set; }

        /// <summary>
        ///计时工价
        /// </summary>
        public decimal? Jishiemoney { get; set; }

        


        /// <summary>
        /// 创建人
        /// </summary>
        public string Creater
        {
            get;
            set;
        }

        /// <summary>
        /// 创建时间
        /// </summary>
        public DateTime? CreateTime
        {
            get;
            set;
        }
        /// <summary>
        /// 修改人
        /// </summary>
        public string Updater
        {
            get;
            set;
        }
        /// <summary>
        /// 修改时间
        /// </summary>
        public DateTime? LastUpdateTime
        {
            get;
            set;
        }



        #endregion Model

        #region Visiter

        /// <summary>
        /// 属性访问器
        /// </summary>
        /// <param name="name">属性名</param>
        /// <param name="index">索引</param>
        /// <param name="isChange">是否将指定属性设置为传入值</param>
        /// <param name="value">需要赋予的值</param>
        /// <returns>与名称对应的属性值</returns>
        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
        {
            object theValue = null;


            if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
            {
                this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
                theValue = this.Keyid;
            }
            else if ("FirmId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
            {
                this.FirmId = isChange ? MyConvert.ConvertToGuid(value) : FirmId;
                theValue = this.FirmId;
            }
            else if ("Shebeiid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
            {
                this.Shebeiid = isChange ? MyConvert.ConvertToInt32(value) : Shebeiid;
                theValue = this.Shebeiid;
            }
            else if ("ShebeiName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
            {
                this.ShebeiName = isChange ? MyConvert.ConvertToString(value) : ShebeiName;
                theValue = this.ShebeiName;
            }

            else if ("Jijianmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
            {
                this.Jijianmoney = isChange ? MyConvert.ConvertToString(value) : Jijianmoney;
                theValue = this.Jijianmoney;
            }
             
            else if ("Jishiemoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
            {
                this.Jishiemoney = isChange ? MyConvert.ConvertToDecimal(value) : Jishiemoney;
                theValue = this.Jishiemoney;
            }
            else if ("Creater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
            {
                this.Creater = isChange ? MyConvert.ConvertToString(value) : Creater;
                theValue = this.Creater;
            }
            else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
            {
                this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
                theValue = this.CreateTime;
            }
            else if ("Updater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
            {
                this.Updater = isChange ? MyConvert.ConvertToString(value) : Updater;
                theValue = this.Updater;
            }
            else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
            {
                this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
                theValue = this.LastUpdateTime;
            }



            return theValue;
        }

        #endregion
    }
}

 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj

@@ -212,6 +212,7 @@
    <Compile Include="OA\OA_ShebeiManageDAL.cs" />
    <Compile Include="OA\OA_PropertyManageDAL.cs" />
    <Compile Include="OA\OA_PropertyRecordDAL.cs" />
    <Compile Include="OA\OA_SheBeijijianDAL.cs" />
    <Compile Include="OA\OA_ShejijijianDAL.cs" />
    <Compile Include="OA\OA_ShiJuanBiaoQianDAL.cs" />
    <Compile Include="OA\OA_StaffFirmProfileDAL.cs" />

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs

@@ -314,7 +314,7 @@
                    }
                    foreach (var m_OA_OutOfStorage in m_OA_OutOfStorageList)
                    {
                        m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='点击查看施工单详情' onclick=\"ViewModel_Special('" + m_EC_SpecialOrders.Keyid + "')\">专版：" + m_EC_SpecialOrders.PSO_OrderNum + "</span>");
                        m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='点击查看施工单详情' onclick=\"ViewModel_Special('" + m_EC_SpecialOrders.PO_OrderId + "')\">专版：" + m_EC_SpecialOrders.PSO_OrderNum + "</span>");
                        dal_OA_OutOfStorageDAL.InserModel(m_OA_OutOfStorage);
                    }
                }

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_InventoryDAL.cs

@@ -384,6 +384,58 @@
            return _dataBase.SelectModelPage<Model.OA_Inventory>(pa, selectTarget, fromSource, "  a.LastUpdateTime ");
        }



        /// <summary>
        /// 获取货品的详细信息
        /// </summary>
        /// <param name="pa"></param>
        /// <param name="FirmId"></param>
        /// <param name="CargoSpaceName"></param>
        /// <param name="WarehouseName"></param>
        /// <param name="GoodsName"></param>
        /// <param name="CommodityName"></param>
        /// <param name="BrandName"></param>
        /// <param name="SpecificationName"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList( Guid FirmId, string WarehouseName, string GoodsName, string CommodityName, string BrandName, string SpecificationName)
        {

            string selectTarget = " a.*,b.Name AS CargoSpaceName , c.WarehouseName AS WarehouseName ,e.Name AS BrandName,f.Name AS SpecificationName,g.GoodsName ,g.CommodityName ,g.IsPaper   ,g.CommodityId";

            string condition = " where a.FirmId='" + FirmId + "'  ";
            if (!string.IsNullOrEmpty(WarehouseName))
            {
                condition += string.Format("  and  a.WarehouseName='{0}' ", WarehouseName);
            }

            if (!string.IsNullOrEmpty(BrandName))
            {
                condition += string.Format("  and  e.Name='{0}' ", BrandName);
            }
            if (!string.IsNullOrEmpty(SpecificationName))
            {
                condition += string.Format("  and  f.Name='{0}' ", SpecificationName);
            }
            if (!string.IsNullOrEmpty(GoodsName))
            {
                condition += string.Format("  and  g.GoodsName='{0}' ", GoodsName);
            }

            if (!string.IsNullOrEmpty(CommodityName))
            {
                condition += string.Format("  and  g.CommodityName='{0}' ", CommodityName);
            }

            string fromSource = "dbo.OA_Inventory  AS a   LEFT JOIN  dbo.OA_CargoSpace AS b ON a.CargoSpaceId=b.Keyid " +
          "  LEFT JOIN dbo.OA_WarehouseInfo AS c ON a.WarehouseId = c.Keyid"
          + "   LEFT JOIN dbo.OA_Specification AS f ON a.SpecificationId=f.Keyid "
           + "  LEFT JOIN dbo.OA_Brand AS e ON a.BrandId = e.Keyid "
          + " LEFT JOIN (SELECT d.*   ,j.CommodityName,j.IsPaper,j.Keyid AS CommodityId FROM dbo.OA_GoodsInfo AS  d "
          + "LEFT JOIN dbo.OA_Commodity AS j ON d.GoodsTypeId=j.Keyid  ) AS g ON a.GoodsId=g.Keyid  " + condition;
            return _dataBase.SelectModel<Model.OA_Inventory>( selectTarget, fromSource);
        }

        public IEnumerable<OA_FirmAccount> getAllSubject(Guid FirmId, string AccountType)
        {
            string selectTarget = "  Keyid,AccountName,AccountType,UserName,Balance";

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_SheBeijijianDAL.cs

New file
@@ -0,0 +1,272 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using System.Data.SqlClient;
using System.Data;
using CY.Model;
using System.Transactions;


namespace CY.SQLDAL
{
    public class OA_ShebeijijianDAL : IOA_ShebeijijianDAL
    {

        private Database _dataBase = null;
        #region 常量
        /// <summary>
        /// 查询目标 
        /// </summary>
        const string SELECTTARGET = " t.* ";
        /// <summary>
        /// 查询来源
        /// </summary>
        const string FROMSOUCEBEFORE = " ( select distinct ok.* " +
          //"     oe.Name as SupplierName   " +
          " from [OA_Shebeijijian] ok  " +


        "   where 0=0  ";
        const string FROMSOUCEEND = ") as t  ";
        /// <summary>
        /// 分页默认排序字段
        /// </summary>
        const string ORDERBY = " CreateTime desc  ";
        #endregion
        public OA_ShebeijijianDAL()
        {
            _dataBase = new Database();
        }


        /// <summary>
        /// 新增
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_Shebeijijian trueModel = model as Model.OA_Shebeijijian;
            if (trueModel == null)
            {
                return false;
            }
            SqlParameter KehuqianshouTime = null;


            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {

                 //new SqlParameter("@Keyid",trueModel.Keyid),
                    new SqlParameter("@FirmId",trueModel.FirmId),
                    new SqlParameter("@Shebeiid",trueModel.Shebeiid.HasValue?trueModel.Shebeiid.Value:0),
                      new SqlParameter("@ShebeiName",string.IsNullOrEmpty(trueModel.ShebeiName)?"":trueModel.ShebeiName),
                        new SqlParameter("@Jijianmoney",string.IsNullOrEmpty(trueModel.Jijianmoney)?"":trueModel.Jijianmoney),
                               new SqlParameter("@Jishiemoney",trueModel.Jishiemoney.HasValue?trueModel.Jishiemoney.Value:0),
                                         new SqlParameter("@CreateTime",trueModel.CreateTime),
                                new SqlParameter("@Updater",trueModel.Updater),
                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
                                    new SqlParameter("@Creater",trueModel.Creater),
                                     




            };
            string sql = "Insert Into OA_Shebeijijian ([FirmId],[Shebeiid],[ShebeiName],[Jijianmoney], [Jishiemoney]  [Creater],[CreateTime],[Updater],[LastUpdateTime] )"
                                             + " Values (@FirmId,@Shebeiid,@ShebeiName, @Jijianmoney, @Jishiemoney  @Creater,@CreateTime,@Updater,@LastUpdateTime  )";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }

       

        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_Shebeijijian trueModel = model as Model.OA_Shebeijijian;
            if (trueModel == null)
            {
                return false;
            }
            SqlParameter KehuqianshouTime = null;


            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {

                new SqlParameter("@Keyid",trueModel.Keyid),
                    new SqlParameter("@FirmId",trueModel.FirmId),
                    new SqlParameter("@Shebeiid",trueModel.Shebeiid.HasValue?trueModel.Shebeiid.Value:0),
                      new SqlParameter("@ShebeiName",string.IsNullOrEmpty(trueModel.ShebeiName)?"":trueModel.ShebeiName),
                        new SqlParameter("@Jijianmoney",string.IsNullOrEmpty(trueModel.Jijianmoney)?"":trueModel.Jijianmoney),
                               new SqlParameter("@Jishiemoney",trueModel.Jishiemoney.HasValue?trueModel.Jishiemoney.Value:0),
                                         new SqlParameter("@CreateTime",trueModel.CreateTime),
                                new SqlParameter("@Updater",trueModel.Updater),
                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
                                    new SqlParameter("@Creater",trueModel.Creater),

            };
            string sql = "Update OA_Shebeijijian Set [FirmId]=@FirmId,[Shebeiid]=@Shebeiid,[ShebeiName]=@ShebeiName,[Jijianmoney]=@Jijianmoney, [Jishiemoney]=@Jishiemoney [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime where [Keyid] =@Keyid ";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }

        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public OA_Shebeijijian GetModelByKeyid(int keyid)
        {
            try
            {
                string condition = "  ";
                if (keyid > 0)
                {
                    condition = " Keyid=" + keyid + "";
                }
                else
                {
                    return null;
                }

                //  return null;//错误数据返会空 

                IList<OA_Shebeijijian> result = _dataBase.SelectModel<OA_Shebeijijian>("*", "OA_Shebeijijian", condition) as IList<OA_Shebeijijian>;//执行查询

                return (null == result || result.Count == 0) ? null : result[0];//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }


        /// <summary>
        /// 全部查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Shebeijijian> SelectAllModel(Infrastructure.Query.Query query)
        {
            return _dataBase.SelectModel<Model.OA_Shebeijijian>(" * ", " OA_Shebeijijian ") as IList<Model.OA_Shebeijijian>;//执行查询
        }

        /// <summary>
        /// 全部查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Shebeijijian> GetModelByformid(Guid formid, string Shebeiid)
        {
            string query = " FirmId = '" + formid + "'";
            if (!string.IsNullOrEmpty(Shebeiid))
            {
                query += " and  Shebeiid = '" + Shebeiid + "'";
            }
           

            return _dataBase.SelectModel<Model.OA_Shebeijijian>(" * ", " OA_Shebeijijian ", query) as IList<Model.OA_Shebeijijian>;//执行查询
        }


        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Shebeijijian> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
        {
            if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
                return null;
            //query.Criteria 首个元素必须是排序字段，其值为结果排序字段

            int maxParamIndex = query.Criteria.Count - 1;//最大索引

            string[] orderbys = new string[] { ORDERBY };
            string resultOrderBy = "";//结果集排序方式

            if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
            {
                orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
                resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
            }
            string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//拼装条件
            return _dataBase.SelectModelPage<Model.OA_Shebeijijian>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
        }

        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_Shebeijijian trueModel = model as Model.OA_Shebeijijian;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                new SqlParameter("@Keyid",trueModel.Keyid)
            };
            string sql = "Delete OA_Shebeijijian Where [Keyid] = @Keyid ";


            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }

        /// <summary>
        /// 批量删除
        /// </summary>
        /// <param name="keyids"></param>
        /// <param name="Memberid"></param>
        /// <returns></returns>
        public bool DelAllModel(string keyids, Guid Memberid)
        {
            try
            {
                int result = _dataBase.ExecuteSql(" DELETE dbo.OA_Shebeijijian WHERE Keyid IN (" + keyids.Trim(',') + ") ");
                return (result > 0);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx

@@ -286,7 +286,7 @@
                        </div>
                                       </td>
                                 <td>
                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount int" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />

                                       </td>
                                 <td>
@@ -414,7 +414,7 @@
                                <td colspan="7">
                                </td>
                            </tr>
                            <tr >
                            <tr style="display:none;" >
                                <td >
                                    <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                        <option value="本厂CTP">本厂CTP</option>
@@ -695,7 +695,7 @@

                 $("select[name='PSF_OpenSpecifications']").last().val("8开");
                 $("select[name='PSF_OpenSpecifications']").last().change();
                 $("input[name='CTPSpecName']").last().val("395*460");
                 $("input[name='CTPSpecName']").last().val("460*395");
                 $("input[name='PSF_PNum']").last().val("");

                 if ($("select[name='PSF_Component']").first().val() == "封面") {
@@ -1035,7 +1035,7 @@
                if ($(this).val().indexOf('六开') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("8开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1077,7 +1077,7 @@
                else if ($(this).val().indexOf('四色') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("四色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("四色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("770*1030");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*770");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1115,7 +1115,7 @@
                else if ($(this).val().indexOf('八色') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("四色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("四色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("790*1030");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*790");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1154,7 +1154,7 @@
                else if ($(this).val().indexOf('黑白') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("760*920");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("920*760");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1193,7 +1193,7 @@
                else if ($(this).val().indexOf('轮转') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("578*810");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("810*579");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
@@ -1268,7 +1268,7 @@
                    
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1308,7 +1308,7 @@

                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1929,7 +1929,7 @@
                 if (keyid != "") {

                 } else {
                     $(vv).val("395*460");
                     $(vv).val("460*395");
                    
                }
            });

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs

@@ -1002,7 +1002,7 @@
                                        m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
                                        m_OA_OutOfStorageOld.CargoSpaceId = 0;
                                        m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
                                        m_OA_OutOfStorageOld.InfoType = "确认出库";
                                        m_OA_OutOfStorageOld.InfoType = "出库";
                                        m_OA_OutOfStorageOld.SuppliersId = 0;
                                        m_OA_OutOfStorageOld.Price = 0;
                                        m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
@@ -1014,7 +1014,10 @@
                                        m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
                                        m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
                                        m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
                                        m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
                                        m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
                                        m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
                                        m_OA_InventoryList.Add(m_OA_InventoryOld);
                                    }
                                }
                            }
@@ -1028,7 +1031,7 @@
                                    m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
                                    m_OA_OutOfStorage.CargoSpaceId = 0;
                                    m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
                                    m_OA_OutOfStorage.InfoType = "确认出库";
                                    m_OA_OutOfStorage.InfoType = "出库";
                                    m_OA_OutOfStorage.SuppliersId = 0;
                                    m_OA_OutOfStorage.Price = 0;
                                    if (j == 0)
@@ -1051,10 +1054,49 @@
                                    m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
                                    m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
                                    m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
                                    m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
                                    m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
                                    m_OA_InventoryList.Add(m_OA_Inventory);
                                }
                            }
                        }

                        var CTPSpecNamei = CTPSpecName[i];
                        var CTPCounti = CTPCount[i];
                        var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
                        if (!string.IsNullOrEmpty(CTPCounti))
                        {
                            OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "板材", "", CTPSpecNamei).FirstOrDefault();
                            if (m_OA_InventoryOld != null)
                            {
                                OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
                                m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
                                m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
                                m_OA_OutOfStorageOld.CargoSpaceId = 0;
                                m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
                                m_OA_OutOfStorageOld.InfoType = "出库";
                                m_OA_OutOfStorageOld.SuppliersId = 0;
                                m_OA_OutOfStorageOld.Price = 0;
                                m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
                                if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
                                {
                                    m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
                                }
                                m_OA_OutOfStorageOld.AllMoney = 0;
                                m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
                                m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
                                m_OA_OutOfStorageOld.Remark = "";
                                m_OA_OutOfStorageOld.TanPrice = 0;
                                m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
                                m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
                                m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
                                m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
                                m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
                                m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
                                m_OA_InventoryList.Add(m_OA_InventoryOld);
                            }
                        }
                    }
                }


 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx

@@ -298,7 +298,7 @@
                        </div>
                                       </td>
                                 <td>
                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount int" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />

                                       </td>
                                 <td>
@@ -426,7 +426,7 @@
                                <td colspan="7">
                                </td>
                            </tr>
                            <tr >
                            <tr style="display:none;" >
                                <td >
                                    <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                        <option value="本厂CTP">本厂CTP</option>
@@ -749,7 +749,7 @@

                $("select[name='PSF_OpenSpecifications']").last().val("8开");
                $("select[name='PSF_OpenSpecifications']").last().change();
                $("input[name='CTPSpecName']").last().val("395*460");
                $("input[name='CTPSpecName']").last().val("460*395");
                $("input[name='PSF_PNum']").last().val("");

                if ($("select[name='PSF_Component']").first().val() == "封面") {
@@ -1108,7 +1108,7 @@
                if ($(this).val().indexOf('六开') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("8开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1150,7 +1150,7 @@
                else if ($(this).val().indexOf('四色') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("四色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("四色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("770*1030");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*770");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1188,7 +1188,7 @@
                else if ($(this).val().indexOf('八色') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("四色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("四色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("790*1030");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*790");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1227,7 +1227,7 @@
                else if ($(this).val().indexOf('黑白') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("760*920");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("920*760");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2开");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1266,7 +1266,7 @@
                else if ($(this).val().indexOf('轮转') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("578*810");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("810*579");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
@@ -1341,7 +1341,7 @@
                    
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1440,7 +1440,7 @@

                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -2077,7 +2077,7 @@

                 } else {
                     if ("<%=PrintTypeId %>" != "7") {
                         $(vv).val("395*460");
                         $(vv).val("460*395");
                     }
                    
                }

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs

@@ -790,7 +790,7 @@
                                        m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
                                        m_OA_OutOfStorageOld.CargoSpaceId = 0;
                                        m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
                                        m_OA_OutOfStorageOld.InfoType = "确认出库";
                                        m_OA_OutOfStorageOld.InfoType = "出库";
                                        m_OA_OutOfStorageOld.SuppliersId = 0;
                                        m_OA_OutOfStorageOld.Price = 0;
                                        m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
@@ -802,7 +802,10 @@
                                        m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
                                        m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
                                        m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
                                        m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
                                        m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
                                        m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
                                        m_OA_InventoryList.Add(m_OA_InventoryOld);
                                    }
                                }
                            }
@@ -816,7 +819,7 @@
                                    m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
                                    m_OA_OutOfStorage.CargoSpaceId = 0;
                                    m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
                                    m_OA_OutOfStorage.InfoType = "确认出库";
                                    m_OA_OutOfStorage.InfoType = "出库";
                                    m_OA_OutOfStorage.SuppliersId = 0;
                                    m_OA_OutOfStorage.Price = 0;
                                    if (j == 0)
@@ -839,10 +842,49 @@
                                    m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
                                    m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
                                    m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
                                    m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
                                    m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
                                    m_OA_InventoryList.Add(m_OA_Inventory);
                                }
                            }
                        }

                        var CTPSpecNamei = CTPSpecName[i];
                        var CTPCounti = CTPCount[i];
                        var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
                        if (!string.IsNullOrEmpty(CTPCounti))
                        {
                            OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "板材", "", CTPSpecNamei).FirstOrDefault();
                            if (m_OA_InventoryOld != null)
                            {
                                OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
                                m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
                                m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
                                m_OA_OutOfStorageOld.CargoSpaceId = 0;
                                m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
                                m_OA_OutOfStorageOld.InfoType = "出库";
                                m_OA_OutOfStorageOld.SuppliersId = 0;
                                m_OA_OutOfStorageOld.Price = 0;
                                m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
                                if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
                                {
                                    m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
                                }
                                m_OA_OutOfStorageOld.AllMoney = 0;
                                m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
                                m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
                                m_OA_OutOfStorageOld.Remark = "";
                                m_OA_OutOfStorageOld.TanPrice = 0;
                                m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
                                m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
                                m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
                                m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
                                m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
                                m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
                                m_OA_InventoryList.Add(m_OA_InventoryOld);
                            }
                        }
                    }
                 }


 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs

@@ -47,7 +47,7 @@
                if (model != null && model.Keyid != null)
                {
                    //退回库存
                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Memberid, "<span class='a_under' title='点击查看施工单详情' onclick=\"ViewModel_Special('" + model.Keyid + "')\">专版：" + model.PSO_OrderNum + "</span>").ToList();
                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Memberid, "<span class='a_under' title='点击查看施工单详情' onclick=\"ViewModel_Special('" + model.PO_OrderId + "')\">专版：" + model.PSO_OrderNum + "</span>").ToList();
                    if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
                    {
                        foreach (var outOfStorage in oA_OutOfStorages)
@@ -120,7 +120,7 @@

                    }
                    //退回库存
                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Memberid, "<span class=''a_under'' title=''点击查看施工单详情'' onclick=\"ViewModel_Special(''" + model.Keyid + "'')\">专版：" + model.PSO_OrderNum + "</span>").ToList();
                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Memberid, "<span class=''a_under'' title=''点击查看施工单详情'' onclick=\"ViewModel_Special(''" + model.PO_OrderId + "'')\">专版：" + model.PSO_OrderNum + "</span>").ToList();
                    if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
                    {
                        foreach(var outOfStorage in oA_OutOfStorages)

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx

@@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <script src="../../js/Inquiry/Inquiry.js?v=210" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=211" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">

 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx

@@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <script src="../../js/Inquiry/Inquiry.js?v=210" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=211" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">

 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs

@@ -1262,7 +1262,7 @@
                                }
                              
                            }
                            else if (inquirySHiJuanModel.Nianji == "三年级" || inquirySHiJuanModel.Nianji == "四年级" || inquirySHiJuanModel.Nianji == "五年级" || inquirySHiJuanModel.Nianji == "六年级")
                            else if (inquirySHiJuanModel.Nianji == "三年级" || inquirySHiJuanModel.Nianji == "四年级" || inquirySHiJuanModel.Nianji == "五年级" )
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                {
@@ -1289,6 +1289,74 @@
                              
                              
                            }

                            else if ( inquirySHiJuanModel.Nianji == "六年级")
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                {
                                    //printDemand += "英语：" + inquirySHiJuanModel.yingyucheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.yingyuselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">英语：" + inquirySHiJuanModel.yingyucheckboxinput + "张，" + inquirySHiJuanModel.yingyuselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuecheckboxinput))
                                {
                                    //printDemand += "科学：" + inquirySHiJuanModel.kexuecheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.kexueselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">科学：" + inquirySHiJuanModel.kexuecheckboxinput + "张，" + inquirySHiJuanModel.kexueselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
                                {
                                    //printDemand += "品德与生活：" + inquirySHiJuanModel.pingdecheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.pingdeselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">品德与生活：" + inquirySHiJuanModel.pingdecheckboxinput + "张，" + inquirySHiJuanModel.pingdeselect + "</td>";
                                }
                                printDemand += "</tr>";
                                printDemand += "<tr>";
                                // printDemand += "答题卡：";
                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">答题卡：</td>";
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                {
                                    //printDemand += "语文：" + inquirySHiJuanModel.yuwendatikacheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">语文：" + inquirySHiJuanModel.yuwendatikacheckboxinput + "张，" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                {
                                    //printDemand += "数学：" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">数学：" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "张，" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                {
                                    //printDemand += "英语：" + inquirySHiJuanModel.yingyudatikacheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">英语：" + inquirySHiJuanModel.yingyudatikacheckboxinput + "张，" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuedatikacheckboxinput))
                                {
                                    //printDemand += "历史：" + inquirySHiJuanModel.kexuedatikacheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.kexuedatikaselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">科学：" + inquirySHiJuanModel.kexuedatikacheckboxinput + "张，" + inquirySHiJuanModel.kexuedatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdedatikacheckboxinput))
                                {
                                    //printDemand += "地理：" + inquirySHiJuanModel.pingdedatikacheckboxinput + "张，";
                                    //printDemand += inquirySHiJuanModel.pingdedatikaselect + "，";

                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">品德与生活：" + inquirySHiJuanModel.pingdedatikacheckboxinput + "张，" + inquirySHiJuanModel.pingdedatikaselect + "</td>";
                                }
                               



                            }
                            else if (inquirySHiJuanModel.Nianji == "七年级")
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))

 CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx

@@ -739,7 +739,7 @@
                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();



                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();

               } else if ($(obj).val() == "三年级" || $(obj).val() == "四年级" || $(obj).val() == "五年级" || $(obj).val() == "六年级") {

               } else if ($(obj).val() == "三年级" || $(obj).val() == "四年级" || $(obj).val() == "五年级" ) {

                   $("tr[name='datika'][value_id='" + value_id + "']").hide();

                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();



@@ -763,7 +763,61 @@


                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();



               } else if ($(obj).val() == "七年级" ) {

               }

               else if ( $(obj).val() == "六年级") {

                   $("tr[name='datika'][value_id='" + value_id + "']").show();

                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();



                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();



                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").show();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").show();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").show();



                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").show();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").show();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").show();



                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='lishititle'][value_id='" + value_id + "']").hide();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").hide();



                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='diliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='dilititle'][value_id='" + value_id + "']").hide();
                   $("span[name='diliunit'][value_id='" + value_id + "']").hide();



                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").hide();



                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='wulititle'][value_id='" + value_id + "']").hide();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").hide();



                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").hide();



                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();



                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();









                   $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();



                   $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='kexuedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='kexuedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='kexuedatikaunit'][value_id='" + value_id + "']").show();



                   $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='pingdedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='pingdedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='pingdedatikaunit'][value_id='" + value_id + "']").show();



                   $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='lishidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='lishidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='lishidatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='dilidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='dilidatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwudatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwudatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwudatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='wulidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='wulidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='wulidatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").hide();



                   $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").hide();

                   $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").hide();

                   $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").hide();

                   $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").hide();



               }

               else if ($(obj).val() == "七年级") {

                   $("tr[name='datika'][value_id='" + value_id + "']").show();

                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();




 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js

@@ -263,7 +263,7 @@
                }
            }
        }
        else if (Nianji == "三年级" || Nianji == "四年级" || Nianji == "五年级" || Nianji == "六年级") {
        else if (Nianji == "三年级" || Nianji == "四年级" || Nianji == "五年级" ) {
            var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
            if (numnn != "") {
@@ -367,6 +367,152 @@
                }
            }
        }

        else if (Nianji == "六年级") {
            var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
            if (numnn != "") {
                num = num + parseInt(numnn);
                shijuannum = shijuannum + parseInt(numnn);

                if (yuwenselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (yuwenselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (yuwenselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (yuwenselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (yuwenselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (yuwenselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
            if (numnnshuxue != "") {
                num = num + parseInt(numnnshuxue);
                shijuannum = shijuannum + parseInt(numnnshuxue);

                if (shuxueselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (shuxueselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (shuxueselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (shuxueselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (shuxueselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (shuxueselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
            if (numnnyingyu != "") {
                num = num + parseInt(numnnyingyu);
                shijuannum = shijuannum + parseInt(numnnyingyu);

                if (yingyuselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (yingyuselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (yingyuselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (yingyuselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (yingyuselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (yingyuselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
            var pingdeselect = $("select[name='pingdeselect'][value_id='" + (i + 1) + "']").val();
            if (numnnpingde != "") {
                num = num + parseInt(numnnpingde);
                shijuannum = shijuannum + parseInt(numnnyingyu);

                if (pingdeselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (pingdeselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (pingdeselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (pingdeselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (pingdeselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (pingdeselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }


            var numnnkexue = $("input[name='kexuecheckboxinput'][value_id='" + (i + 1) + "']").val();
            var kexueselect = $("select[name='kexueselect'][value_id='" + (i + 1) + "']").val();
            if (numnnkexue != "") {
                num = num + parseInt(numnnkexue);
                shijuannum = shijuannum + parseInt(numnnkexue);

                if (kexueselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (kexueselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (kexueselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (kexueselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (kexueselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (kexueselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }


            var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnyuwendatika != "") {
                num = num + parseInt(numnnyuwendatika);
                datikanum = datikanum + parseInt(numnnyuwendatika);

                datikakshu = datikakshu + 1;
            }
            var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnshuxuedatika != "") {
                num = num + parseInt(numnnshuxuedatika);
                datikanum = datikanum + parseInt(numnnshuxuedatika);

                datikakshu = datikakshu + 1;
            }

            var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnyingyudatika != "") {
                num = num + parseInt(numnnyingyudatika);
                datikanum = datikanum + parseInt(numnnyingyudatika);

                datikakshu = datikakshu + 1;
            }
            var numnnkexuedatika = $("input[name='kexuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();


            if (numnnkexuedatika != "") {
                num = num + parseInt(numnnkexuedatika);
                datikanum = datikanum + parseInt(numnnkexuedatika);
                datikakshu = datikakshu + 1;
            }
            var numnnpingdedatika = $("input[name='pingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnpingdedatika != "") {
                num = num + parseInt(numnnpingdedatika);
                datikanum = datikanum + parseInt(numnnpingdedatika);
            }


            

        }
        else if (Nianji == "七年级") {
            var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();