username@email.com
2025-11-10 dc6639a232f181970fa5291005f206fa34f1b1da
提交
4个文件已修改
17 ■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
@@ -226,6 +226,7 @@
                    JavaScript.MessageBox( "没有填写发货数量", this);
                    return;
                }
                var createtimea = DateTime.Now;
                var ssss = false;
                for (int i = 0; i < fahuos.Length; i++)
                {
@@ -234,7 +235,7 @@
                    coreCmsPlanOrder.name = names[i];
                    coreCmsPlanOrder.specification = specifications[i];
                    coreCmsPlanOrder.nums = fahuos[i].ToInt32().Value;
                    coreCmsPlanOrder.createTime = DateTime.Now;
                    coreCmsPlanOrder.createTime = createtimea;
                    coreCmsPlanOrder.upDataTime = coreCmsPlanOrder.createTime;
                    coreCmsPlanOrder.createBy = CurrentUser.ShortName;
                    coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -34,7 +34,7 @@
        }
        //保险
        function onViewfahuo(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookfahuoqingkuang.aspx?orderId=" + keyid, Title: "查看发货情况",  Width: 1500, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookfahuoqingkuang.aspx?orderId=" + keyid, Title: "查看发货情况",  Width: 1800, Height: 900 });
        }
        
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx
@@ -126,7 +126,7 @@
                            <th width="30" style="text-align: center" >
                                编号
                            </th>
                            <th style="text-align: center" >
                            <th style="text-align: center" width="150" >
                                发货日期
                            </th>
                            <th style="text-align: center" >
@@ -141,8 +141,8 @@
                        <td style="text-align: center">
                            <%#Container.ItemIndex + 1%>
                        </td>
                        <td style="text-align: center">
                         <%#Eval("createTime","{0:yyyy-MM-dd}")%>
                        <td style="text-align: center" width="150">
                         <%#Eval("createTime","{0:yyyy-MM-dd HH:mm:ss}")%>
                        </td>
                        <td style="text-align: center">
                           <%#Eval("name")%>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
@@ -129,10 +129,10 @@
          var  cmsPlanOrderFahuos  =  coreCmsPlanOrderFahuos.GroupBy(p => new { p.createTime.Value.Date }).Select(g => new CoreCmsPlanOrderFahuo
          var  cmsPlanOrderFahuos  =  coreCmsPlanOrderFahuos.GroupBy(p => new { p.createTime.Value }).Select(g => new CoreCmsPlanOrderFahuo
            {
                // 分组字段
                createTime = g.Key.Date,
                createTime = g.Key.Value,
                
            }).OrderByDescending(x=>x.createTime).ToList();
@@ -141,7 +141,7 @@
                cmsPlanOrderFahuo.name = corname;
                var cmsPlanOrderFahuos1 = coreCmsPlanOrderFahuos.Where(x => x.createTime.Value.Date == cmsPlanOrderFahuo.createTime);
                var cmsPlanOrderFahuos1 = coreCmsPlanOrderFahuos.Where(x => x.createTime.Value == cmsPlanOrderFahuo.createTime);
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    var nums = cmsPlanOrderFahuos1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x=>x.nums);