提交

username@email.com

2024-12-23 4ddba64becec3891e4682ec92f0066ab571d9422

提交

 CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs

@@ -154,7 +154,7 @@
                Condition += " and  ok.Creater like '%" + Creater + "%'";

            if (!string.IsNullOrEmpty(SupplierName))
                Condition += " and (ok.Huming like '%" + SupplierName + "%' or oe.Name like '%" + SupplierName + "%'  ) ";
                Condition += " and  ok.SupplierName like '%" + SupplierName + "%'    ";
            if (!string.IsNullOrEmpty(shifoufukuan))
                Condition += " and  ok.FukuanStatus = '" + shifoufukuan + "'";

@@ -190,7 +190,7 @@
                Condition += " and  ok.Creater like '%" + Creater + "%'";

            if (!string.IsNullOrEmpty(SupplierName))
                Condition += " and (ok.Huming like '%" + SupplierName + "%' or oe.Name like '%" + SupplierName + "%'  ) ";
                Condition += " and  ok.SupplierName like '%" + SupplierName + "%'    ";
            if (!string.IsNullOrEmpty(shifoufukuan))
                Condition += " and  ok.FukuanStatus = '" + shifoufukuan + "'";


 CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs

@@ -43,7 +43,8 @@
        /// <summary>
        /// 客户id
        /// </summary>
        public int SupplierId { get; set; }
        public string SupplierId { get; set; }

        /// <summary>
        /// 客户id
        /// </summary>
@@ -185,7 +186,7 @@
            }
            else if ("SupplierId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
            {
                this.SupplierId = isChange ? MyConvert.ConvertToInt32(value).Value : SupplierId;
                this.SupplierId = isChange ? MyConvert.ConvertToString(value) : SupplierId;
                theValue = this.SupplierId;
            }
            else if ("SupplierName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs

@@ -23,9 +23,9 @@
        /// <summary>
        /// 查询来源
        /// </summary>
        const string FROMSOUCEBEFORE = " ( select distinct ok.*, " +
             "     oe.Name as SupplierName   " +
          " from [OA_Fukuanshenqing] ok left join  [OA_Suppliers] oe  on oe.Keyid = ok.[SupplierId] " +
        const string FROMSOUCEBEFORE = " ( select distinct ok.* " +
             //"     oe.Name as SupplierName   " +
          " from [OA_Fukuanshenqing] ok  " +

       
        "   where 0=0  ";
@@ -78,13 +78,14 @@
                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
                                    new SqlParameter("@Creater",trueModel.Creater),
                                     new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
                                       new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),




            };
            string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming)"
                                             + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming )";
            string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming,SupplierName)"
                                             + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName )";
            
            try
            {
@@ -130,13 +131,14 @@
                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
                                    new SqlParameter("@Creater",trueModel.Creater),
                                      new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
                                         new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),




            };
            string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming)"
                                             + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming )";
            string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming,SupplierName)"
                                             + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName )";
            int id = 0;
            try
            {
@@ -186,9 +188,10 @@
                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
                                    new SqlParameter("@Creater",trueModel.Creater),
                                     new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
                                       new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),

            };
            string sql = "Update OA_Fukuanshenqing Set [FirmId]=@FirmId,[SupplierId]=@SupplierId,[Fukuanshenqingstatus]=@Fukuanshenqingstatus,[ApprovalStatus]=@ApprovalStatus, [Fukuanmoney]=@Fukuanmoney, [Bank]=@Bank,[AccountID]=@AccountID, [Yishoumoney]=@Yishoumoney,[Youwufapiao]=@Youwufapiao, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Fukuanyongtu=@Fukuanyongtu,FukuanStatus=@FukuanStatus,remark=@remark,DindanId=@DindanId,Huming=@Huming where [Keyid] =@Keyid ";
            string sql = "Update OA_Fukuanshenqing Set [FirmId]=@FirmId,[SupplierId]=@SupplierId,[Fukuanshenqingstatus]=@Fukuanshenqingstatus,[ApprovalStatus]=@ApprovalStatus, [Fukuanmoney]=@Fukuanmoney, [Bank]=@Bank,[AccountID]=@AccountID, [Yishoumoney]=@Yishoumoney,[Youwufapiao]=@Youwufapiao, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Fukuanyongtu=@Fukuanyongtu,FukuanStatus=@FukuanStatus,remark=@remark,DindanId=@DindanId,Huming=@Huming,SupplierName=@SupplierName where [Keyid] =@Keyid ";

            try
            {

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

@@ -137,11 +137,17 @@
            Pagination pa = new Pagination();
            pa.PageSize = 500;
            pa.PageIndex = 1;
            this.selOutFirm.DataSource = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
            var ss = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
            this.selOutFirm.DataSource = ss;
            this.selOutFirm.DataTextField = "OutVendorName";
            this.selOutFirm.DataValueField = "FirmId";
            this.selOutFirm.DataBind();
            this.selOutFirm.Items.Insert(0, new ListItem("请选择", ""));
           var aaa  = ss.FirstOrDefault(x => x.OutVendorName == "其他");
            if (aaa != null)
            {
                this.selOutFirm.SelectedValue = aaa.FirmId.ToString();
            }
            selOutFirm_SelectedIndexChanged(null, null);
        }


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

@@ -118,8 +118,11 @@
            top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
        }
        //查看
        function onView(keyid) {
            top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "查看供应商", Width: 950, Height: 650 });
        function onView(keyid, yongtu) {
            if (yongtu !="其他付款") {
                top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "查看供应商", Width: 950, Height: 650 });
            }
          
        }

 
@@ -288,7 +291,7 @@
                                </td>
                                 <td style="text-align: center;">
                                     
                                    <a href='javascript:void(0)' title='点击查看 <%#Eval("SupplierName").ToString()%> 资料' class='a_under' onclick='onView("<%#Eval("SupplierId")%>")'><%#Eval("SupplierName") %></a>
                                    <a href='javascript:void(0)' title='点击查看 <%#Eval("SupplierName").ToString()%> 资料' class='a_under' onclick='onView("<%#Eval("SupplierId")%>","<%#Eval("Fukuanyongtu")%>")'><%#Eval("SupplierName") %></a>
                                        

                                   

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

@@ -178,7 +178,7 @@


                        oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
                        oA_Fukuanshenqing.SupplierId = this.selSuppliers.Value.ToInt32().Value;
                        oA_Fukuanshenqing.SupplierId = this.selSuppliers.Value;
                        oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
                        oA_Fukuanshenqing.ApprovalStatus = 0;
                        oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
@@ -200,15 +200,16 @@
                        oA_Fukuanshenqing.CreateTime = DateTime.Now;
                        oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
                        oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;

                        var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);

                        var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
                        var _SupplierName = "";
                        if (oA_Suppliers != null)
                        {
                            _SupplierName = oA_Suppliers.Name;
                        }
                        oA_Fukuanshenqing.SupplierName = _SupplierName;
                        var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);

                       

                        //需要添加审批信息
                        DateTime nowTime = DateTime.Now;
@@ -244,7 +245,7 @@

                            m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                            m_OA_WorkPlan.PlanComplany = id.ToString();
                            m_OA_WorkPlan.PlanContent = orderNoStr + " 外协付款申请。订单金额："+ this.ordernjine.InnerText + ", 收款单位："+ _SupplierName;
                            m_OA_WorkPlan.PlanContent = orderNoStr + " 外协付款申请。订单金额："+ this.ordernjine.InnerText + ", 收款单位："+ _SupplierName + ", 户名：" + oA_Fukuanshenqing.Huming;
                            m_OA_WorkPlan.PlanDataType = 14;
                            m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
                            m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;

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

@@ -120,8 +120,11 @@
            top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
        }
        //查看
        function onView(keyid) {
            top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "查看供应商", Width: 950, Height: 650 });
        function onView(keyid, yongtu) {
            if (yongtu != "其他付款") {
                top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "查看供应商", Width: 950, Height: 650 });
            }
           
        }

 
@@ -278,7 +281,7 @@
                                      

                                     
                                    <a href='javascript:void(0)' title='点击查看 <%#Eval("SupplierName").ToString()%> 资料' class='a_under' onclick='onView("<%#Eval("SupplierId")%>")'><%#Eval("SupplierName") %></a>
                                    <a href='javascript:void(0)' title='点击查看 <%#Eval("SupplierName").ToString()%> 资料' class='a_under' onclick='onView("<%#Eval("SupplierId")%>","<%#Eval("Fukuanyongtu")%>")'><%#Eval("SupplierName") %></a>
                                        
                                </td>
                                 <td style="text-align: center;">

 CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs

@@ -87,15 +87,10 @@
                }
                else
                {
                    if (fukuanshenqing.SupplierId > 0)
                    {
                        var oA_Suppliers = oA_SuppliersBLL.getSingleSupplier(fukuanshenqing.SupplierId.ToString());
                        if (oA_Suppliers != null)
                        {
                            this.txtPaymentUnit.Value = oA_Suppliers.Name;
                            this.txtSupplierId.Value = oA_Suppliers.Keyid.ToString();
                        }
                    }
                    this.txtPaymentUnit.Value = fukuanshenqing.SupplierName;
                    this.txtSupplierId.Value = fukuanshenqing.SupplierId.ToString();

                   
                   
                   
                }

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx

@@ -14,7 +14,7 @@
                供应商：
            </td>
            <td>
                <select id="selSuppliers" runat="server" class="Sreq w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="请选择供应商">
                <select id="selSuppliers" runat="server" class="w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="请选择供应商">
                </select>
            </td>
            <td class="ali03  w100px">

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx

@@ -42,7 +42,7 @@
                    供应商名称：
                </td>
                <td>
                    <input id="txtName" type="text" runat="server" class="  req" />
                    <input id="txtName" type="text" runat="server" class="  req" onchange="changgetxtName();" />
                </td>
                <td class="ali03 ">
                    营业执照号：
@@ -279,6 +279,11 @@
                                $(this).parent().parent().find(".Files").find("br").last().remove();
                            });
                        });


                        function changgetxtName() {
                            $("#txtHuming").val($("#txtName").val());
                        }
                    </script>
                </td>
            </tr>

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

@@ -118,13 +118,14 @@


                    oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
                    oA_Fukuanshenqing.SupplierId = 0;
                    oA_Fukuanshenqing.SupplierId = "0";
                    oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
                    oA_Fukuanshenqing.ApprovalStatus = 1;
                    oA_Fukuanshenqing.Fukuanmoney = m_OA_WorkPlan.PlanMoney;

                    oA_Fukuanshenqing.Bank = "";
                    oA_Fukuanshenqing.Huming = m_OA_WorkPlan.PlanComplany;
                    oA_Fukuanshenqing.SupplierName = m_OA_WorkPlan.PlanComplany;
                    oA_Fukuanshenqing.AccountID = "";
                    oA_Fukuanshenqing.Yishoumoney = 0;
                    oA_Fukuanshenqing.Youwufapiao = 0;