CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiManageBLL.cs

@@ -112,9 +112,9 @@
        /// <param name="_CateId"></param>
        /// <param name="IsSearch"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId, int? _CateId, bool IsSearch)
        public IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId, string _CateId, bool IsSearch, int? Status)
        {
            return iOA_ShebeiManageDAL.GetDataByCate(_MemberId,_CateId,IsSearch);
            return iOA_ShebeiManageDAL.GetDataByCate(_MemberId,_CateId,IsSearch, Status);
        }
        /// <summary>
        /// 根据客户编号获取客户

 CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiManageDAL.cs

@@ -49,7 +49,7 @@
        /// <param name="_CateId"></param>
        /// <param name="IsSearch"></param>
        /// <returns></returns>
        IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId, int? _CateId, bool IsSearch);
        IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId, string _CateId, bool IsSearch, int? Status);

        /// <summary>
        /// 根据客户编号获取客户

 CY_ECommercePlatform/CY.Model/EC/EC_MergerHoudaos.cs

@@ -47,6 +47,8 @@
        public string PSF_Beishu { get; set; }
        public string PSF_Jichang { get; set; }

        public int? PSF_JichangId { get; set; }

        public string PSF_Yaoqiu { get; set; }

       
@@ -102,6 +104,11 @@
                this.PSF_Yaoqiu = isChange ? MyConvert.ConvertToString(value) : PSF_Yaoqiu;
                theValue = this.PSF_Yaoqiu;
            }
            else if ("PSF_JichangId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
            {
                this.PSF_JichangId = isChange ? MyConvert.ConvertToInt32(value) : PSF_JichangId;
                theValue = this.PSF_JichangId;
            }
            

            return theValue;

 CY_ECommercePlatform/CY.Model/EC/EC_SpecialHoudaos.cs

@@ -47,6 +47,8 @@
        public string PSF_Beishu { get; set; }
        public string PSF_Jichang { get; set; }

        public int? PSF_JichangId { get; set; }

        public string PSF_Yaoqiu { get; set; }

       
@@ -102,7 +104,12 @@
                this.PSF_Yaoqiu = isChange ? MyConvert.ConvertToString(value) : PSF_Yaoqiu;
                theValue = this.PSF_Yaoqiu;
            }
           
            else if ("PSF_JichangId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
            {
                this.PSF_JichangId = isChange ? MyConvert.ConvertToInt32(value) : PSF_JichangId;
                theValue = this.PSF_JichangId;
            }


            return theValue;
        }

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerHoudaosDAL.cs

@@ -44,10 +44,11 @@
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
                   
                    new SqlParameter("@PSF_JichangId",trueModel.PSF_JichangId.HasValue?trueModel.PSF_JichangId.Value:0),

            };
            string sql = "Insert Into EC_MergerHoudaos ([MergerOrderId],[PSF_Houdaogongxu],[PSF_Shuliang],[PSF_Beishu], [PSF_Jichang], [PSF_Yaoqiu])"
                                             + " Values (@MergerOrderId,@PSF_Houdaogongxu,@PSF_Shuliang, @PSF_Beishu, @PSF_Jichang, @PSF_Yaoqiu )";
            string sql = "Insert Into EC_MergerHoudaos ([MergerOrderId],[PSF_Houdaogongxu],[PSF_Shuliang],[PSF_Beishu], [PSF_Jichang], [PSF_Yaoqiu],[PSF_JichangId])"
                                             + " Values (@MergerOrderId,@PSF_Houdaogongxu,@PSF_Shuliang, @PSF_Beishu, @PSF_Jichang, @PSF_Yaoqiu,@PSF_JichangId )";

            try
            {
@@ -81,8 +82,9 @@
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
                     new SqlParameter("@PSF_JichangId",trueModel.PSF_JichangId.HasValue?trueModel.PSF_JichangId.Value:0),
            };
            string sql = "Update EC_MergerHoudaos Set [MergerOrderId]=@MergerOrderId,[PSF_Houdaogongxu]=@PSF_Houdaogongxu,[PSF_Shuliang]=@PSF_Shuliang,[PSF_Beishu]=@PSF_Beishu, [PSF_Jichang]=@PSF_Jichang, [PSF_Yaoqiu]=@PSF_Yaoqiu where [Keyid] =@Keyid ";
            string sql = "Update EC_MergerHoudaos Set [MergerOrderId]=@MergerOrderId,[PSF_Houdaogongxu]=@PSF_Houdaogongxu,[PSF_Shuliang]=@PSF_Shuliang,[PSF_Beishu]=@PSF_Beishu, [PSF_Jichang]=@PSF_Jichang, [PSF_Yaoqiu]=@PSF_Yaoqiu,[PSF_JichangId]=@PSF_JichangId where [Keyid] =@Keyid ";

            try
            {

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialHoudaosDAL.cs

@@ -44,10 +44,11 @@
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
                   
                     new SqlParameter("@PSF_JichangId",trueModel.PSF_JichangId.HasValue?trueModel.PSF_JichangId.Value:0),

            };
            string sql = "Insert Into EC_SpecialHoudaos ([SpecialOrderId],[PSF_Houdaogongxu],[PSF_Shuliang],[PSF_Beishu], [PSF_Jichang], [PSF_Yaoqiu])"
                                             + " Values (@SpecialOrderId,@PSF_Houdaogongxu,@PSF_Shuliang, @PSF_Beishu, @PSF_Jichang, @PSF_Yaoqiu )";
            string sql = "Insert Into EC_SpecialHoudaos ([SpecialOrderId],[PSF_Houdaogongxu],[PSF_Shuliang],[PSF_Beishu], [PSF_Jichang], [PSF_Yaoqiu],[PSF_JichangId])"
                                             + " Values (@SpecialOrderId,@PSF_Houdaogongxu,@PSF_Shuliang, @PSF_Beishu, @PSF_Jichang, @PSF_Yaoqiu,@PSF_JichangId )";

            try
            {
@@ -81,8 +82,9 @@
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
                    new SqlParameter("@PSF_JichangId",trueModel.PSF_JichangId.HasValue?trueModel.PSF_JichangId.Value:0),
            };
            string sql = "Update EC_SpecialHoudaos Set [SpecialOrderId]=@SpecialOrderId,[PSF_Houdaogongxu]=@PSF_Houdaogongxu,[PSF_Shuliang]=@PSF_Shuliang,[PSF_Beishu]=@PSF_Beishu, [PSF_Jichang]=@PSF_Jichang, [PSF_Yaoqiu]=@PSF_Yaoqiu where [Keyid] =@Keyid ";
            string sql = "Update EC_SpecialHoudaos Set [SpecialOrderId]=@SpecialOrderId,[PSF_Houdaogongxu]=@PSF_Houdaogongxu,[PSF_Shuliang]=@PSF_Shuliang,[PSF_Beishu]=@PSF_Beishu, [PSF_Jichang]=@PSF_Jichang, [PSF_Yaoqiu]=@PSF_Yaoqiu,[PSF_JichangId]=@PSF_JichangId where [Keyid] =@Keyid ";

            try
            {

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs

@@ -300,7 +300,7 @@
        /// <param name="_CateId"></param>
        /// <param name="IsSearch"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId,int? _CateId,bool IsSearch)
        public IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId,string _CateId,bool IsSearch, int? Status)
        {
            try
            {
@@ -309,12 +309,15 @@
                if (_MemberId != Guid.Empty)
                    condition += " and MemberId = '" + _MemberId + "'";

                if (_CateId>0)
                    condition += " and CateId = '" + _CateId + "'";
                if (!string.IsNullOrEmpty(_CateId))
                    condition += " and CateId in ( " + _CateId + ")";

                if (!IsSearch)
                    condition += " and AllNum > ReceiveNum and Status = '1' ";

                if (Status.HasValue && Status > 0)
                    condition += " and Status = '" + Status + "'";

                return _dataBase.SelectModel<Model.OA_ShebeiManage>(" * ", " OA_ShebeiManage ", condition);
            }
            catch (Exception ex)

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

@@ -513,22 +513,22 @@
                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
                    <ItemTemplate>
                                        
                                             <td>
                                             <td style="width:10%;">
                      
                            <%#Eval("PSF_Houdaogongxu")%>
                        
                    </td>

                                              <td>
                                              <td style="width:10%;">
                        数量: <%#Eval("PSF_Shuliang")%>
                    </td>
                                             <td>
                                             <td style="width:10%;">
                        倍数: <%#Eval("PSF_Beishu")%>
                    </td>
       <td>
       <td style="width:10%;">
                        机长:<%#Eval("PSF_Jichang")%>
                    </td>
                                              <td>
                                              <td> 
                        
                       要求: <%#Eval("PSF_Yaoqiu")%>
                         

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

@@ -499,19 +499,22 @@
                    <ItemTemplate>
                                         <tr class="AddHoudao" value_id="<%#Container.ItemIndex + 1%>" >
                                             <td>
                        <select keepdefaultstyle="true"   class=" w70px" name="selHoudaogongxu" >
                        <select keepdefaultstyle="true"   class=" w70px" name="selHoudaogongxu" value_id="<%#Container.ItemIndex + 1%>"  >
                            <%#Eval("PSF_Houdaogongxu")%>
                        </select>
                    </td>

                                              <td>
                        数量:<input type="text" name="txtShuliang" class=" w40px int" min="0" maxlength="50" value="<%#Eval("PSF_Shuliang")%>"/>
                        数量:<input type="text" name="txtShuliang" class=" w40px int" min="0" maxlength="50" value="<%#Eval("PSF_Shuliang")%>"  value_id="<%#Container.ItemIndex + 1%>" />
                    </td>
                                             <td>
                        倍数:<input type="text" name="txtBeishu" class=" w40px int" min="0" maxlength="50"  value="<%#Eval("PSF_Beishu")%>"/>
                        倍数:<input type="text" name="txtBeishu" class=" w40px float" min="0" maxlength="50"  value="<%#Eval("PSF_Beishu")%>"  value_id="<%#Container.ItemIndex + 1%>" />
                    </td>
       <td>
                        机长:<input type="text" name="txtJichang" class=" w80px"  maxlength="50" value="<%#Eval("PSF_Jichang")%>"/>
                        机长:<%--<input type="text" name="txtJichang" class=" w80px"  maxlength="50" value="<%#Eval("PSF_Jichang")%>"/>--%>
             <select keepdefaultstyle="true"   class=" w70px" name="selJichang" value_id="<%#Container.ItemIndex + 1%>" >
                            <%#Eval("PSF_Jichang")%>
                        </select>
                    </td>
                                              <td>
                        
@@ -553,6 +556,9 @@
   
    </form>
     <script type="text/javascript">
         var jsonStr = '<%=shebeilist%>'
         var dataList = JSON.parse(jsonStr);
/*         alert(dataList.length);*/
         var value_WaerId = 0;
         $(function () {

@@ -744,7 +750,10 @@
                 $(".AddHoudao").last().attr("value_id", value_id + 1);
                 $(".AddHoudaos").last().attr("value_id", value_id + 1);
                 $(".CutHoudaos").last().attr("value_id", value_id + 1);

                 $("select[name='selHoudaogongxu']").last().attr("value_id", value_id + 1);
                 $("select[name='selJichang']").last().attr("value_id", value_id + 1);
                 $("input[name='txtShuliang']").last().attr("value_id", value_id + 1);
                 $("input[name='txtBeishu']").last().attr("value_id", value_id + 1);
             });


@@ -752,11 +761,38 @@
                 var value_id = parseInt($(this).attr("value_id"));
                 var count = $('.AddHoudao').length;
                 if (count == 1) {
                     $("select[name='selHoudaogongxu'][value_id='" + value_id + "']").val("");
                     $("select[name='selJichang'][value_id='" + value_id + "']").val("");
                     $("input[name='txtShuliang'][value_id='" + value_id + "']").val("");
                     $("input[name='txtBeishu'][value_id='" + value_id + "']").val("");
                 } else {
                     $(".AddHoudao[value_id='" + value_id + "']").remove();
                 }
             });


             $("select[name='selHoudaogongxu']").live("change", function () {

                 var value_id = $(this).attr("value_id");
                 var selectId = $(this).val(); // 获取选中的值
                 // 清空第二个下拉框
                 $("select[name='selJichang'][value_id='" + value_id + "']").empty().append("<option value='0'>请选择</option>");
                 if (!selectId) return;
                 // ======================
                 // 关键：从集合里筛选数据！
                 // ======================
                 var filterData = dataList.filter(item =>
                     item.Name.includes(selectId)
                 );

                 // 填充到第二个下拉框
                 $.each(filterData, function (i, item) {

                     $("select[name='selJichang'][value_id='" + value_id + "']").append("<option value='" + item.Zerenren + "'>" + item.ZerenrenName + "</option>");
                 });

             });

            $("select[name='PSF_PaperSource']").live("change", function () {
                var value_SelWaerId = $(this).attr("value_SelWaerId");
                if ($(this).val() == "来自仓库") {

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

@@ -29,6 +29,8 @@
        OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
        public Guid targetid = Guid.Empty;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
        OA_ShebeiManageBLL bll_oA_ShebeiManageBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;



@@ -47,6 +49,8 @@
        public string xialapr = "";

        AfterParameterInfoBLL _afterParameterInfoBLL = null;
        public string shebeilist = "";
        public List<OA_ShebeiManage> oA_ShebeiManages = new List<OA_ShebeiManage>();
        //初始化
        public AgMergerOrderEdit()
        {
@@ -60,6 +64,8 @@
            bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
            _afterParameterInfoBLL = new AfterParameterInfoBLL();
            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            bll_oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
        }

        //页面加载
@@ -88,6 +94,13 @@
            List<EC_MemberDictionary> m_EC_MemberDictionaryList_filmSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带菲林规格") as List<EC_MemberDictionary>;
            List<EC_MemberDictionary> m_EC_MemberDictionaryList_ctpSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带CTP规格") as List<EC_MemberDictionary>;

            //初始化设备列表
            var a_ShebeiCate =  bll_oA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId).Where(x=>x.Name == "生产设备" || x.Name == "印刷设备" || x.Name == "装订设备").ToList();
            if (a_ShebeiCate != null && a_ShebeiCate.Count > 0)
            {
                oA_ShebeiManages =  bll_oA_ShebeiManageBLL.GetDataByCate(CurrentUser.MemberId, a_ShebeiCate[0].Keyid + "," + a_ShebeiCate[1].Keyid + "," + a_ShebeiCate[2].Keyid, true, 2).ToList();
                shebeilist = JsonHelper.GetJsonStringByObject(oA_ShebeiManages);
            }
            Pagination pa = new Pagination();
            pa.PageSize = 15;
            pa.PageIndex = 1;
@@ -188,7 +201,7 @@
            }
            keyidstr = m_EC_MergerSingle.Keyid.ToString2();
            EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();

            var shuliang = 0;
            List<EC_OrderBasic> mEC_OrderBasicList = new List<EC_OrderBasic>();
            foreach (var item in orderId)
            {
@@ -251,6 +264,7 @@
                        _eC_OrderBasic.PrintSizeName = _inquiryCommonModel.PrintSizeName;
                    }
                }
                shuliang += (_eC_OrderBasic.OrderExtend.SurplusPrintNum??0);
                mEC_OrderBasicList.Add(_eC_OrderBasic);
            }
            #endregion
@@ -313,12 +327,22 @@
            {
                m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
                EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
                m_EC_MergerHoudaos.PSF_Shuliang = shuliang.ToString() ;
                m_EC_MergerHoudaos.PSF_Beishu = "1";
                m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);

            }

            List<int> houdaolist = new List<int>();
            List<string> houdaostringlist = new List<string>();
            List<string> houdaosssss = new List<string>();
            houdaosssss.Add("折页");
            houdaosssss.Add("骑马钉");
            houdaosssss.Add("胶装");
            houdaosssss.Add("压痕");
            houdaosssss.Add("烫金");
            houdaosssss.Add("粘信封");
            houdaosssss.Add("粘页");
            foreach (var eC_OrderBasic in mEC_OrderBasicList)
            {
                EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(eC_OrderBasic.Keyid.ToInt32().Value);
@@ -413,8 +437,50 @@
                       
                }

               
                foreach (var houdao in houdaosssss)
                {
                    if (sysInquiry_Afters.Count(x => x.ParameterName == houdao) <= 0)
                    {

                        if (houdao == c_MergerHoudaos.PSF_Houdaogongxu)
                        {
                            select += "<option value='" + houdao + "' selected=\"selected\" >" + houdao + "</option>";
                        }
                        else
                        {
                            select += "<option value='" + houdao + "' >" + houdao + "</option>";
                        }
                    }


                }

                string houdaoduibi = c_MergerHoudaos.PSF_Houdaogongxu;
                c_MergerHoudaos.PSF_Houdaogongxu = select;


                //机长选项
                string selectjizhang = "<option value='0'>请选择</option>";
                if (!string.IsNullOrEmpty(houdaoduibi))
                {
                    var oA_ShebeiManageshoudao = oA_ShebeiManages.Where(x => x.Name.Contains(houdaoduibi));
                    foreach (var a_ShebeiManage in oA_ShebeiManageshoudao)
                    {
                        if (a_ShebeiManage.Zerenren == c_MergerHoudaos.PSF_JichangId)
                        {
                            selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' selected=\"selected\" >" + a_ShebeiManage.ZerenrenName + "</option>";
                        }
                        else
                        {
                            selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' >" + a_ShebeiManage.ZerenrenName + "</option>";
                        }
                    }
                }
                   


                c_MergerHoudaos.PSF_Jichang = selectjizhang;

            }

            this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
@@ -576,7 +642,7 @@
                string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
                string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
                string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
                string[] txtJichang = Request["txtJichang"].ToString2().Split(',');
                string[] selJichang = Request["selJichang"].ToString2().Split(',');
                string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');


@@ -1107,13 +1173,22 @@
                    m_EC_MergerHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace("，+-+，", ",");
                    m_EC_MergerHoudaos.PSF_Shuliang = txtShuliang[i];
                    m_EC_MergerHoudaos.PSF_Beishu = txtBeishu[i];
                    m_EC_MergerHoudaos.PSF_Jichang = txtJichang[i];
                    m_EC_MergerHoudaos.PSF_JichangId = selJichang[i].ToInt32();
                    if(m_EC_MergerHoudaos.PSF_JichangId.HasValue && m_EC_MergerHoudaos.PSF_JichangId.Value > 0)
                    {
                        var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_EC_MergerHoudaos.PSF_JichangId);
                        if (oA_Staff != null)
                        {
                            m_EC_MergerHoudaos.PSF_Jichang = oA_Staff.Name;
                        }
                    }
                    else
                    {
                        m_EC_MergerHoudaos.PSF_Jichang = "";
                    }

                    m_EC_MergerHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
                    if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Shuliang)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Beishu)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Jichang)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Yaoqiu))
                    if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu))
                    {
                        m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
                    }

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

@@ -445,19 +445,19 @@
                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
                    <ItemTemplate>
                                        
                                             <td>
                                             <td style="width:10%;">
                      
                            <%#Eval("PSF_Houdaogongxu")%>
                        
                    </td>

                                              <td>
                                              <td style="width:10%;">
                        数量: <%#Eval("PSF_Shuliang")%>
                    </td>
                                             <td>
                                             <td style="width:10%;">
                        倍数: <%#Eval("PSF_Beishu")%>
                    </td>
       <td>
       <td style="width:10%;">
                        机长:<%#Eval("PSF_Jichang")%>
                    </td>
                                              <td>

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

@@ -511,19 +511,22 @@
                    <ItemTemplate>
                                         <tr class="AddHoudao" value_id="<%#Container.ItemIndex + 1%>" >
                                             <td>
                        <select keepdefaultstyle="true"   class=" w70px" name="selHoudaogongxu" >
                        <select keepdefaultstyle="true"   class=" w70px" name="selHoudaogongxu"  value_id="<%#Container.ItemIndex + 1%>"  >
                            <%#Eval("PSF_Houdaogongxu")%>
                        </select>
                    </td>

                                              <td>
                        数量:<input type="text" name="txtShuliang" class=" w40px int" min="0" maxlength="50" value="<%#Eval("PSF_Shuliang")%>"/>
                        数量:<input type="text" name="txtShuliang" class=" w40px int" min="0" maxlength="50" value="<%#Eval("PSF_Shuliang")%>" value_id="<%#Container.ItemIndex + 1%>"  />
                    </td>
                                             <td>
                        倍数:<input type="text" name="txtBeishu" class=" w40px int" min="0" maxlength="50"  value="<%#Eval("PSF_Beishu")%>"/>
                        倍数:<input type="text" name="txtBeishu" class=" w40px float" min="0" maxlength="50"  value="<%#Eval("PSF_Beishu")%>" value_id="<%#Container.ItemIndex + 1%>"  />
                    </td>
       <td>
                        机长:<input type="text" name="txtJichang" class=" w80px"  maxlength="50" value="<%#Eval("PSF_Jichang")%>"/>
                        机长:<%--<input type="text" name="txtJichang" class=" w80px"  maxlength="50" value="<%#Eval("PSF_Jichang")%>"/>--%>
             <select keepdefaultstyle="true"   class=" w70px" name="selJichang" value_id="<%#Container.ItemIndex + 1%>" >
                            <%#Eval("PSF_Jichang")%>
                        </select>
                    </td>
                                              <td>
                        
@@ -607,6 +610,9 @@
    </table>
    </form>
    <script type="text/javascript">
        var jsonStr = '<%=shebeilist%>'
        var dataList = JSON.parse(jsonStr);
/*        alert(dataList[19].Name);*/
        var value_WaerId = 0;
        $(function () {

@@ -815,7 +821,10 @@
                $(".AddHoudao").last().attr("value_id", value_id + 1);
                $(".AddHoudaos").last().attr("value_id", value_id + 1);
                $(".CutHoudaos").last().attr("value_id", value_id + 1);
                
                $("select[name='selHoudaogongxu']").last().attr("value_id", value_id + 1);
                $("select[name='selJichang']").last().attr("value_id", value_id + 1);
                $("input[name='txtShuliang']").last().attr("value_id", value_id + 1);
                $("input[name='txtBeishu']").last().attr("value_id", value_id + 1);
            });


@@ -823,6 +832,10 @@
                var value_id = parseInt($(this).attr("value_id"));
                var count = $('.AddHoudao').length;
                if (count == 1) {
                    $("select[name='selHoudaogongxu'][value_id='" + value_id + "']").val("");
                    $("select[name='selJichang'][value_id='" + value_id + "']").val("");
                    $("input[name='txtShuliang'][value_id='" + value_id + "']").val("");
                    $("input[name='txtBeishu'][value_id='" + value_id + "']").val("");
                } else {
                    $(".AddHoudao[value_id='" + value_id + "']").remove();
                }
@@ -830,6 +843,30 @@




            $("select[name='selHoudaogongxu']").live("change", function () {
               
                var value_id = $(this).attr("value_id");
                var selectId = $(this).val(); // 获取选中的值
                // 清空第二个下拉框
                $("select[name='selJichang'][value_id='" + value_id + "']").empty().append("<option value='0'>请选择</option>");
                if (!selectId) return;
                // ======================
                // 关键：从集合里筛选数据！
                // ======================
                var filterData = dataList.filter(item =>
                    item.Name.includes(selectId)
                );

                // 填充到第二个下拉框
                $.each(filterData, function (i, item) {
                    
                    $("select[name='selJichang'][value_id='" + value_id + "']").append("<option value='" + item.Zerenren + "'>" + item.ZerenrenName + "</option>");
                });

            });


            $("select[name='PSF_PaperSource']").live("change", function () {
                var value_SelWaerId = $(this).attr("value_SelWaerId");
                if ($(this).val() == "来自仓库") {

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

@@ -48,6 +48,10 @@
        public string shukuanhuaceneiye5 = "";
        public string PrintTypeId = "";
        AfterParameterInfoBLL _afterParameterInfoBLL = null;
        OA_ShebeiManageBLL bll_oA_ShebeiManageBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        public string shebeilist = "";
        public List<OA_ShebeiManage> oA_ShebeiManages = new List<OA_ShebeiManage>();
        //初始化
        public AgSpecialOrderEdit()
        {
@@ -57,6 +61,8 @@
            bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
            bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
            _afterParameterInfoBLL = new AfterParameterInfoBLL();
            bll_oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
        }

        //页面加载
@@ -80,6 +86,14 @@
            List<EC_MemberDictionary> m_EC_MemberDictionaryList_paperSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带纸规格") as List<EC_MemberDictionary>;
            List<EC_MemberDictionary> m_EC_MemberDictionaryList_filmSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带菲林规格") as List<EC_MemberDictionary>;
            List<EC_MemberDictionary> m_EC_MemberDictionaryList_ctpSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带CTP规格") as List<EC_MemberDictionary>;

            //初始化设备列表
            var a_ShebeiCate = bll_oA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId).Where(x => x.Name == "生产设备" || x.Name == "印刷设备" || x.Name == "装订设备").ToList();
            if (a_ShebeiCate != null && a_ShebeiCate.Count > 0)
            {
                oA_ShebeiManages = bll_oA_ShebeiManageBLL.GetDataByCate(CurrentUser.MemberId, a_ShebeiCate[0].Keyid + "," + a_ShebeiCate[1].Keyid + "," + a_ShebeiCate[2].Keyid, true, 2).ToList();
                shebeilist = JsonHelper.GetJsonStringByObject(oA_ShebeiManages);
            }

            Pagination pa = new Pagination();
            pa.PageSize = 15;
@@ -321,12 +335,22 @@
            {
                m_EC_SpecialHoudaosList = new List<EC_SpecialHoudaos>();
                EC_SpecialHoudaos m_EC_SpecialHoudaos = new EC_SpecialHoudaos();
                m_EC_SpecialHoudaos.PSF_Shuliang = _eC_OrderBasic.OrderExtend.SurplusPrintNum.ToString2();
                m_EC_SpecialHoudaos.PSF_Beishu = "1";
                m_EC_SpecialHoudaosList.Add(m_EC_SpecialHoudaos);
                
            }

            var ssssss = _inquiryCommonModel.AfterWorkList;
            var inquiryInsideModels = _inquiryCommonModel.InquiryInsideList;
            List<string> houdaosssss = new List<string>();
            houdaosssss.Add("折页");
            houdaosssss.Add("骑马钉");
            houdaosssss.Add("胶装");
            houdaosssss.Add("压痕");
            houdaosssss.Add("烫金");
            houdaosssss.Add("粘信封");
            houdaosssss.Add("粘页");
            foreach (var c_SpecialHoudaos in m_EC_SpecialHoudaosList)
            {
                List<int> houdaolist = new List<int>();
@@ -385,7 +409,45 @@
                       

                }
                
                foreach (var houdao in houdaosssss)
                {
                    if (sysInquiry_Afters.Count(x => x.ParameterName == houdao) <= 0)
                    {

                        if (houdao == c_SpecialHoudaos.PSF_Houdaogongxu)
                        {
                            select += "<option value='" + houdao + "' selected=\"selected\" >" + houdao + "</option>";
                        }
                        else
                        {
                            select += "<option value='" + houdao + "' >" + houdao + "</option>";
                        }
                    }

                      
                }
                string houdaoduibi = c_SpecialHoudaos.PSF_Houdaogongxu;
                c_SpecialHoudaos.PSF_Houdaogongxu = select;

                //机长选项
                string selectjizhang = "<option value='0'>请选择</option>";
                if (!string.IsNullOrEmpty(houdaoduibi))
                {
                    var oA_ShebeiManageshoudao = oA_ShebeiManages.Where(x => x.Name.Contains(houdaoduibi));
                    foreach (var a_ShebeiManage in oA_ShebeiManageshoudao)
                    {
                        if (a_ShebeiManage.Zerenren == c_SpecialHoudaos.PSF_JichangId)
                        {
                            selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' selected=\"selected\" >" + a_ShebeiManage.ZerenrenName + "</option>";
                        }
                        else
                        {
                            selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' >" + a_ShebeiManage.ZerenrenName + "</option>";
                        }
                    }
                }
                c_SpecialHoudaos.PSF_Jichang = selectjizhang;
            }

            this.RepeaterHoudaoList.DataSource = m_EC_SpecialHoudaosList;
@@ -550,7 +612,7 @@
                string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
                string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
                string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
                string[] txtJichang = Request["txtJichang"].ToString2().Split(',');
                string[] selJichang = Request["selJichang"].ToString2().Split(',');
                string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');

                //if (PSF_Forumsid.Length != PSF_Component.Length || PSF_Forumsid.Length != PSF_PNum.Length || PSF_Forumsid.Length != PSF_PressesDesk.Length || PSF_Forumsid.Length != PSF_PrintedColorPositive.Length || PSF_Forumsid.Length != PSF_PrintedColorRear.Length || PSF_Forumsid.Length != PSF_Typesetting.Length || PSF_Forumsid.Length != PSF_PrintedCount.Length || PSF_Forumsid.Length != PSF_PrintedPositive.Length || PSF_Forumsid.Length != PSF_LastNum.Length || PSF_Forumsid.Length != PSF_SheetSource.Length || PSF_Forumsid.Length != PSF_SpecificationsSheet.Length || PSF_Forumsid.Length != PSF_EditionCount.Length || PSF_Forumsid.Length != PSF_PaperSource.Length || PSF_Forumsid.Length != PSF_PaperId.Length || PSF_Forumsid.Length != PSF_PaperName.Length || PSF_Forumsid.Length != PSF_MaterialSpecifications.Length || PSF_Forumsid.Length != PSF_BigPaperCount.Length || PSF_Forumsid.Length != PSF_OpenSpecifications.Length || PSF_Forumsid.Length != PSF_OpenWidth.Length || PSF_Forumsid.Length != PSF_OpenLength.Length || PSF_Forumsid.Length != PSF_Note.Length)
@@ -895,13 +957,22 @@
                    m_EC_SpecialHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace("，+-+，", ",");
                    m_EC_SpecialHoudaos.PSF_Shuliang = txtShuliang[i] ;
                    m_EC_SpecialHoudaos.PSF_Beishu = txtBeishu[i];
                    m_EC_SpecialHoudaos.PSF_Jichang = txtJichang[i];
                    m_EC_SpecialHoudaos.PSF_JichangId = selJichang[i].ToInt32();
                    if (m_EC_SpecialHoudaos.PSF_JichangId.HasValue && m_EC_SpecialHoudaos.PSF_JichangId.Value > 0)
                    {
                        var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_EC_SpecialHoudaos.PSF_JichangId);
                        if (oA_Staff != null)
                        {
                            m_EC_SpecialHoudaos.PSF_Jichang = oA_Staff.Name;
                        }
                    }
                    else
                    {
                        m_EC_SpecialHoudaos.PSF_Jichang = "";
                    }

                    m_EC_SpecialHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
                    if(!string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Houdaogongxu)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Shuliang)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Beishu)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Jichang)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Yaoqiu)){
                    if(!string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Houdaogongxu)){
                        m_EC_SpecialHoudaosList.Add(m_EC_SpecialHoudaos);
                    }
                }

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

@@ -783,7 +783,15 @@
                    {
                        if (orderState == 1)
                        {
                            isCan = false;
                            if (opType == "撤单")
                            {
                                isCan = true;
                            }
                            else
                            {
                                isCan = false;
                            }
                               
                        }
                        else
                        {

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

@@ -342,7 +342,7 @@
                this.selCustormerManagers.Items.Insert(0, new ListItem("无", "0"));

                var ToUpSetData = Request["ToUpSetData"];
                var oA_Staffs = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 13);
                var oA_Staffs = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 2);
                this.SelShejirenyuan29.DataSource = oA_Staffs;
                this.SelShejirenyuan29.DataBind();
                if (string.IsNullOrEmpty(ToUpSetData))

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

@@ -493,7 +493,7 @@
                this.selBusinessManager.DataBind();
                this.selBusinessManager.Items.Insert(0, new ListItem("全部", ""));

                this.selShejirenyuan.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 13); ;
                this.selShejirenyuan.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 2); ;
                this.selShejirenyuan.DataBind();
                this.selShejirenyuan.Items.Insert(0, new ListItem("全部", ""));


 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs

@@ -263,8 +263,9 @@
                    }
                    else
                    {
                        this.txtSM_Birthday.Visible = false;
                        this.spanSM_Birthday.InnerText = m_OA_Staff.SM_Birthday.Value.ToString("yyyy-MM-dd");
                        this.txtSM_Birthday.Value = m_OA_Staff.SM_Birthday.Value.ToString("yyyy-MM-dd");
                        //this.txtSM_Birthday.Visible = false;
                        // this.spanSM_Birthday.InnerText = m_OA_Staff.SM_Birthday.Value.ToString("yyyy-MM-dd");
                    }
                    this.txtSM_IDCardNum.Value = m_OA_Staff.SM_IDCardNum.ToString2();
                    if (!string.IsNullOrEmpty(m_OA_Staff.SM_IDCardPic) && System.IO.File.Exists(HttpContext.Current.Server.MapPath("~" + m_OA_Staff.SM_IDCardPic)))

 CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx

@@ -187,7 +187,7 @@
                        审批回复：
                    </td>
                    <td colspan="3">
                        <textarea id="txtApprovalContent" runat="server" style="width: 460px; height: 40px;" ></textarea>
                        <textarea id="txtApprovalContent" runat="server" style="width: 460px; height: 40px;" maxlength="250" ></textarea>
                    </td>
                </tr>
                <td colspan="4" style="text-align: center;">

 CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs

@@ -130,6 +130,12 @@
                        JavaScript.MessageBox("你没有审批权限", this);
                        return;
                    }

                    if (this.txtApprovalContent.Value.Trim().Length>250)
                    {
                        JavaScript.MessageBox("审批回复过长，最多250个字", this);
                        return;
                    }
                    OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
                    if (m_OA_WorkPlan.ApprovalStatus == 1 || m_OA_WorkPlan.ApprovalStatus == 2)
                    {