铺货和计划订单的修改。计划订单增加批量查看

username@email.com

2024-06-27 3fc58aef2f6f47c4a356df23479e3becca630177

铺货和计划订单的修改。计划订单增加批量查看

 CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs

@@ -119,6 +119,13 @@


        /// <summary>
        /// 调整标题
        /// </summary>
        [Display(Name = "调整标题")]
        [SugarColumn(IsIgnore = true)]
        public string tiaozhengbiaoti { get; set; }

        /// <summary>
        /// 调整数量
        /// </summary>
        [Display(Name = "调整数量")]

 CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs

@@ -44,6 +44,8 @@
using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressDeliveryOpenMessageGetDeliveryListResponse.Types;
using System.Threading.Channels;
using System.Collections.Generic;
using EnumsNET;
using NPOI.SS.Formula.Functions;

namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -645,6 +647,70 @@
        }
        #endregion




        #region 选择导出============================================================
        // POST: Api/CoreCmsPlanOrder/SelectExportExcel/10
        /// <summary>
        /// 选择导出
        /// </summary>
        /// <param name="entity"></param>
        /// <returns></returns>
        [HttpPost]
        [Description("选择导出")]
        public async Task<AdminUiCallBack> Selectselectchakan([FromBody] FMArrayStringIds entity)
        {
            var jm = new AdminUiCallBack();

            //创建Excel文件的对象
            var book = new HSSFWorkbook();
            //添加一个sheet
            var mySheet = book.CreateSheet("Sheet1");
            //获取list数据
            var listModel = await _CoreCmsPlanOrderServices.QueryListByClauseAsync(p => entity.id.Contains(p.orderId), p => p.orderId, OrderByType.Asc, true);

            var coreCmsPlanOrderItems = new List<CoreCmsPlanOrderItem>();
            //将数据逐步写入sheet1各个行
            for (var i = 0; i < listModel.Count; i++)
            {
                var modelItem1 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == true, p => p.specification, OrderByType.Asc);

                var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == false, p => p.specification, OrderByType.Asc);


                foreach (var coreCmsPlanOrderItem in modelItem1)
                {
                    var coreCmsPlanOrderItem1 = modelItem2.Where(p => p.name == coreCmsPlanOrderItem.name && p.specification == coreCmsPlanOrderItem.specification).FirstOrDefault();
                    if (coreCmsPlanOrderItem1 != null)
                    {
                        coreCmsPlanOrderItem.idnew = coreCmsPlanOrderItem1.id;
                        coreCmsPlanOrderItem.numsnew = coreCmsPlanOrderItem1.nums;
                        coreCmsPlanOrderItem.amountnew = coreCmsPlanOrderItem1.amount;
                    }
                    coreCmsPlanOrderItems.Add(coreCmsPlanOrderItem);
                }
            }

            var groupedByMultipleFields = coreCmsPlanOrderItems.GroupBy(p => new { p.name, p.specification })
                .Select(p=>new CoreCmsPlanOrderItem
                {
                    name = p.Key.name,
                    specification = p.Key.specification,
                    nums = p.Sum(c => c.nums),
                    numsnew = p.Sum(c => c.numsnew),

                }).ToList();



            jm.data = groupedByMultipleFields;
            jm.code = 0;

            return jm;
        }
        #endregion

        #region 选择导出============================================================
        // POST: Api/CoreCmsPlanOrder/SelectExportExcel/10
        /// <summary>
@@ -676,19 +742,19 @@
            cellNum++;

            var cell1 = headerRow.CreateCell(cellNum);
            cell1.SetCellValue("调整订单金额");
            cell1.SetCellValue("市");
            cell1.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell2 = headerRow.CreateCell(cellNum);
            cell2.SetCellValue("订单状态");
            cell2.SetCellValue("区县");
            cell2.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell3 = headerRow.CreateCell(cellNum);
            cell3.SetCellValue("用户ID 关联user.id");
            cell3.SetCellValue("片区");
            cell3.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
@@ -706,79 +772,141 @@
            cellNum++;

            var cell6 = headerRow.CreateCell(cellNum);
            cell6.SetCellValue("收货电话");
            cell6.SetCellValue("联系电话");
            cell6.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell7 = headerRow.CreateCell(cellNum);
            cell7.SetCellValue("计划订单金额");
            cell7.SetCellValue("收货地址");
            cell7.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell8 = headerRow.CreateCell(cellNum);
            cell8.SetCellValue("可用余额");
            cell8.SetCellValue("计划金额");
            cell8.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell9 = headerRow.CreateCell(cellNum);
            cell9.SetCellValue("建立时间");
            cell9.SetCellValue("调整金额");
            cell9.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell10 = headerRow.CreateCell(cellNum);
            cell10.SetCellValue("修改时间");
            cell10.SetCellValue("可用余额");
            cell10.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell11 = headerRow.CreateCell(cellNum);
            cell11.SetCellValue("创建人");
            cell11.SetCellValue("商品名称");
            cell11.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell12 = headerRow.CreateCell(cellNum);
            cell12.SetCellValue("修改人");
            cell12.SetCellValue("单价（元）");
            cell12.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell13 = headerRow.CreateCell(cellNum);
            cell13.SetCellValue("删除标志");
            cell13.SetCellValue("计划数量");
            cell13.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell14 = headerRow.CreateCell(cellNum);
            cell14.SetCellValue("计划金额（元）");
            cell14.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell15 = headerRow.CreateCell(cellNum);
            cell15.SetCellValue("调整数量");
            cell15.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell16 = headerRow.CreateCell(cellNum);
            cell16.SetCellValue("调整金额（元）");
            cell16.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            headerRow.Height = 30 * 20;
            var commonCellStyle = ExcelHelper.GetCommonStyle(book);


            var rows = 1;
            //将数据逐步写入sheet1各个行
            for (var i = 0; i < listModel.Count; i++)
            {
                var rowTemp = mySheet.CreateRow(i + 1);
                var cellNumTemp = 0;
                var modelItem1 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == true, p => p.specification, OrderByType.Asc);

                var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == false, p => p.specification, OrderByType.Asc);


                foreach (var coreCmsPlanOrderItem in modelItem1)
                {
                    var coreCmsPlanOrderItem1 = modelItem2.Where(p => p.name == coreCmsPlanOrderItem.name && p.specification == coreCmsPlanOrderItem.specification).FirstOrDefault();
                    if (coreCmsPlanOrderItem1 != null)
                    {
                        coreCmsPlanOrderItem.idnew = coreCmsPlanOrderItem1.id;
                        coreCmsPlanOrderItem.numsnew = coreCmsPlanOrderItem1.nums;
                        coreCmsPlanOrderItem.amountnew = coreCmsPlanOrderItem1.amount;
                    }
                }
                var coreCmsOrderItems = new List<CoreCmsOrderItem>();
                //查询用计划订单积分购买的订单
                var coreCmsOrders = await _orderServices.QueryListByClauseAsync(p => p.planorderId == listModel[i].orderId && p.isdel == false);
                if (coreCmsOrders != null && coreCmsOrders.Count > 0)
                {
                    var orderids = new List<string>();
                    foreach (var coreCmsOrder in coreCmsOrders)
                    {
                        orderids.Add(coreCmsOrder.orderId);
                    }
                    coreCmsOrderItems = await _orderItemServices.QueryListByClauseAsync(p => orderids.Contains(p.orderId));

                }
                foreach (var  coreCmsOrder1 in coreCmsOrderItems)
                {
                    var coreCmsPlanOrderItem = new CoreCmsPlanOrderItem();
                    coreCmsPlanOrderItem.name = coreCmsOrder1.name;
                    coreCmsPlanOrderItem.specification = coreCmsOrder1.addon;
                    coreCmsPlanOrderItem.price = coreCmsOrder1.price;
                    coreCmsPlanOrderItem.nums = 0;
                    coreCmsPlanOrderItem.amount = 0;
                    coreCmsPlanOrderItem.numsnew = coreCmsOrder1.nums;
                    coreCmsPlanOrderItem.amountnew = coreCmsOrder1.amount;

                    modelItem1.Add(coreCmsPlanOrderItem);
                }
                for (var j = 0; j < modelItem1.Count; j++)
                {
                    var rowTemp = mySheet.CreateRow(rows);//i + 1
                    var cellNumTemp = 0;
                    var rowTemp0 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp0.SetCellValue(listModel[i].orderId.ToString());
                        rowTemp0.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp1 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp1.SetCellValue(listModel[i].orderAmount.ToString());
                    rowTemp1.SetCellValue(listModel[i].shi.ToString());
                        rowTemp1.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp2 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp2.SetCellValue(listModel[i].status.ToString());
                    rowTemp2.SetCellValue(listModel[i].quxian.ToString());
                        rowTemp2.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp3 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp3.SetCellValue(listModel[i].userId.ToString());
                    rowTemp3.SetCellValue(listModel[i].pianqu.ToString());
                        rowTemp3.CellStyle = commonCellStyle;
                        cellNumTemp++;

@@ -798,39 +926,65 @@
                        cellNumTemp++;

                    var rowTemp7 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp7.SetCellValue(listModel[i].oldOrderAmount.ToString());
                    rowTemp7.SetCellValue(listModel[i].shouhuoAddress.ToString());
                        rowTemp7.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp8 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp8.SetCellValue(listModel[i].keYongAmount.ToString());
                    rowTemp8.SetCellValue(listModel[i].oldOrderAmount.ToString());
                        rowTemp8.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp9 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp9.SetCellValue(listModel[i].createTime.ToString());
                    rowTemp9.SetCellValue(listModel[i].orderAmount.ToString());
                        rowTemp9.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp10 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp10.SetCellValue(listModel[i].upDataTime.ToString());
                    rowTemp10.SetCellValue(listModel[i].keYongAmount.ToString());
                        rowTemp10.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp11 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp11.SetCellValue(listModel[i].createBy.ToString());
                    rowTemp11.SetCellValue(modelItem1[j].name.ToString() + modelItem1[j].specification.ToString());
                        rowTemp11.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp12.SetCellValue(listModel[i].upDataBy.ToString());
                    rowTemp12.SetCellValue(modelItem1[j].price.ToString());
                        rowTemp12.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp13 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp13.SetCellValue(listModel[i].isdelete.ToString());
                    rowTemp13.SetCellValue(modelItem1[j].nums.ToString());
                        rowTemp13.CellStyle = commonCellStyle;
                        cellNumTemp++;

                    var rowTemp14 = rowTemp.CreateCell(cellNumTemp);
                    rowTemp14.SetCellValue(modelItem1[j].amount.ToString());
                    rowTemp14.CellStyle = commonCellStyle;
                    cellNumTemp++;

                    var rowTemp15 = rowTemp.CreateCell(cellNumTemp);
                    rowTemp15.SetCellValue(modelItem1[j].numsnew.ToString());
                    rowTemp15.CellStyle = commonCellStyle;
                    cellNumTemp++;

                    var rowTemp16 = rowTemp.CreateCell(cellNumTemp);
                    rowTemp16.SetCellValue(modelItem1[j].amountnew.ToString());
                    rowTemp16.CellStyle = commonCellStyle;
                    cellNumTemp++;



                    rows++;
                }


                


               

            }
            // 导出excel
@@ -875,6 +1029,24 @@
            if (!string.IsNullOrEmpty(orderId))
            {
                where = where.And(p => p.orderId.Contains(orderId));
            }
            //市 varchar
            var shi = Request.Form["shi"].FirstOrDefault().ObjectToInt(0);
            if (shi > 0)
            {
                where = where.And(p => p.shiId == shi);
            }
            //区县 varchar
            var quxian = Request.Form["quxian"].FirstOrDefault().ObjectToInt(0); ;
            if (quxian > 0)
            {
                where = where.And(p => p.quxianId == quxian);
            }
            //收货地址 varchar
            var shouhuoAddress = Request.Form["shouhuoAddress"].FirstOrDefault();
            if (!string.IsNullOrEmpty(shouhuoAddress))
            {
                where = where.And(p => p.shouhuoAddress.Contains(shouhuoAddress));
            }
            //调整订单金额 decimal
            var orderAmount = Request.Form["orderAmount"].FirstOrDefault().ObjectToDecimal(0);
@@ -1001,19 +1173,19 @@
            cellNum++;
            
            var cell1 = headerRow.CreateCell(cellNum);
            cell1.SetCellValue("调整订单金额");
            cell1.SetCellValue("市");
            cell1.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell2 = headerRow.CreateCell(cellNum);
            cell2.SetCellValue("订单状态");
            cell2.SetCellValue("区县");
            cell2.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell3 = headerRow.CreateCell(cellNum);
            cell3.SetCellValue("用户ID 关联user.id");
            cell3.SetCellValue("片区");
            cell3.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
@@ -1031,50 +1203,68 @@
            cellNum++;
            
            var cell6 = headerRow.CreateCell(cellNum);
            cell6.SetCellValue("收货电话");
            cell6.SetCellValue("联系电话");
            cell6.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell7 = headerRow.CreateCell(cellNum);
            cell7.SetCellValue("计划订单金额");
            cell7.SetCellValue("收货地址");
            cell7.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell8 = headerRow.CreateCell(cellNum);
            cell8.SetCellValue("可用余额");
            cell8.SetCellValue("计划金额");
            cell8.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell9 = headerRow.CreateCell(cellNum);
            cell9.SetCellValue("建立时间");
            cell9.SetCellValue("调整金额");
            cell9.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell10 = headerRow.CreateCell(cellNum);
            cell10.SetCellValue("修改时间");
            cell10.SetCellValue("可用余额");
            cell10.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell11 = headerRow.CreateCell(cellNum);
            cell11.SetCellValue("创建人");
            cell11.SetCellValue("商品名称");
            cell11.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell12 = headerRow.CreateCell(cellNum);
            cell12.SetCellValue("修改人");
            cell12.SetCellValue("单价（元）");
            cell12.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
            var cell13 = headerRow.CreateCell(cellNum);
            cell13.SetCellValue("删除标志");
            cell13.SetCellValue("计划数量");
            cell13.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell14 = headerRow.CreateCell(cellNum);
            cell14.SetCellValue("计划金额（元）");
            cell14.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell15 = headerRow.CreateCell(cellNum);
            cell15.SetCellValue("调整数量");
            cell15.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;

            var cell16 = headerRow.CreateCell(cellNum);
            cell16.SetCellValue("调整金额（元）");
            cell16.CellStyle = headerStyle;
            mySheet.SetColumnWidth(cellNum, 10 * 256);
            cellNum++;
            
@@ -1082,29 +1272,72 @@
            headerRow.Height = 30 * 20;
            var commonCellStyle = ExcelHelper.GetCommonStyle(book);

            var rows = 1;
            //将数据逐步写入sheet1各个行
            for (var i = 0; i < listModel.Count; i++)
            {
                var rowTemp = mySheet.CreateRow(i + 1);
                var cellNumTemp = 0;
                var modelItem1 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == true, p => p.specification, OrderByType.Asc);

                var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == false, p => p.specification, OrderByType.Asc);


                foreach (var coreCmsPlanOrderItem in modelItem1)
                {
                    var coreCmsPlanOrderItem1 = modelItem2.Where(p => p.name == coreCmsPlanOrderItem.name && p.specification == coreCmsPlanOrderItem.specification).FirstOrDefault();
                    if (coreCmsPlanOrderItem1 != null)
                    {
                        coreCmsPlanOrderItem.idnew = coreCmsPlanOrderItem1.id;
                        coreCmsPlanOrderItem.numsnew = coreCmsPlanOrderItem1.nums;
                        coreCmsPlanOrderItem.amountnew = coreCmsPlanOrderItem1.amount;
                    }
                }
                var coreCmsOrderItems = new List<CoreCmsOrderItem>();
                //查询用计划订单积分购买的订单
                var coreCmsOrders = await _orderServices.QueryListByClauseAsync(p => p.planorderId == listModel[i].orderId && p.isdel == false);
                if (coreCmsOrders != null && coreCmsOrders.Count > 0)
                {
                    var orderids = new List<string>();
                    foreach (var coreCmsOrder in coreCmsOrders)
                    {
                        orderids.Add(coreCmsOrder.orderId);
                    }
                    coreCmsOrderItems = await _orderItemServices.QueryListByClauseAsync(p => orderids.Contains(p.orderId));

                }
                foreach (var coreCmsOrder1 in coreCmsOrderItems)
                {
                    var coreCmsPlanOrderItem = new CoreCmsPlanOrderItem();
                    coreCmsPlanOrderItem.name = coreCmsOrder1.name;
                    coreCmsPlanOrderItem.specification = coreCmsOrder1.addon;
                    coreCmsPlanOrderItem.price = coreCmsOrder1.price;
                    coreCmsPlanOrderItem.nums = 0;
                    coreCmsPlanOrderItem.amount = 0;
                    coreCmsPlanOrderItem.numsnew = coreCmsOrder1.nums;
                    coreCmsPlanOrderItem.amountnew = coreCmsOrder1.amount;

                    modelItem1.Add(coreCmsPlanOrderItem);
                }
                for (var j = 0; j < modelItem1.Count; j++)
                {
                    var rowTemp = mySheet.CreateRow(rows);//i + 1
                    var cellNumTemp = 0;
            var rowTemp0 = rowTemp.CreateCell(cellNumTemp);
                rowTemp0.SetCellValue(listModel[i].orderId.ToString());
                rowTemp0.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp1 = rowTemp.CreateCell(cellNumTemp);
                rowTemp1.SetCellValue(listModel[i].orderAmount.ToString());
                    rowTemp1.SetCellValue(listModel[i].shi.ToString());
                rowTemp1.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp2 = rowTemp.CreateCell(cellNumTemp);
                rowTemp2.SetCellValue(listModel[i].status.ToString());
                    rowTemp2.SetCellValue(listModel[i].quxian.ToString());
                rowTemp2.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp3 = rowTemp.CreateCell(cellNumTemp);
                rowTemp3.SetCellValue(listModel[i].userId.ToString());
                    rowTemp3.SetCellValue(listModel[i].pianqu.ToString());
                rowTemp3.CellStyle = commonCellStyle;
                cellNumTemp++;

@@ -1124,40 +1357,66 @@
                cellNumTemp++;

            var rowTemp7 = rowTemp.CreateCell(cellNumTemp);
                rowTemp7.SetCellValue(listModel[i].oldOrderAmount.ToString());
                    rowTemp7.SetCellValue(listModel[i].shouhuoAddress.ToString());
                rowTemp7.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp8 = rowTemp.CreateCell(cellNumTemp);
                rowTemp8.SetCellValue(listModel[i].keYongAmount.ToString());
                    rowTemp8.SetCellValue(listModel[i].oldOrderAmount.ToString());
                rowTemp8.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp9 = rowTemp.CreateCell(cellNumTemp);
                rowTemp9.SetCellValue(listModel[i].createTime.ToString());
                    rowTemp9.SetCellValue(listModel[i].orderAmount.ToString());
                rowTemp9.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp10 = rowTemp.CreateCell(cellNumTemp);
                rowTemp10.SetCellValue(listModel[i].upDataTime.ToString());
                    rowTemp10.SetCellValue(listModel[i].keYongAmount.ToString());
                rowTemp10.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp11 = rowTemp.CreateCell(cellNumTemp);
                rowTemp11.SetCellValue(listModel[i].createBy.ToString());
                    rowTemp11.SetCellValue(modelItem1[j].name.ToString() + modelItem1[j].specification.ToString());
                rowTemp11.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
                rowTemp12.SetCellValue(listModel[i].upDataBy.ToString());
                    rowTemp12.SetCellValue(modelItem1[j].price.ToString());
                rowTemp12.CellStyle = commonCellStyle;
                cellNumTemp++;

            var rowTemp13 = rowTemp.CreateCell(cellNumTemp);
                rowTemp13.SetCellValue(listModel[i].isdelete.ToString());
                    rowTemp13.SetCellValue(modelItem1[j].nums.ToString());
                rowTemp13.CellStyle = commonCellStyle;
                cellNumTemp++;

                    var rowTemp14 = rowTemp.CreateCell(cellNumTemp);
                    rowTemp14.SetCellValue(modelItem1[j].amount.ToString());
                    rowTemp14.CellStyle = commonCellStyle;
                    cellNumTemp++;

                    var rowTemp15 = rowTemp.CreateCell(cellNumTemp);
                    rowTemp15.SetCellValue(modelItem1[j].numsnew.ToString());
                    rowTemp15.CellStyle = commonCellStyle;
                    cellNumTemp++;

                    var rowTemp16 = rowTemp.CreateCell(cellNumTemp);
                    rowTemp16.SetCellValue(modelItem1[j].amountnew.ToString());
                    rowTemp16.CellStyle = commonCellStyle;
                    cellNumTemp++;



                    rows++;
                }







            }
            // 写入到excel
            string webRootPath = _webHostEnvironment.WebRootPath;

 CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs

@@ -215,7 +215,7 @@

            var products = await _productsServices.GetProducts();

            var distributions = await _coreCmsDistributionServices.QueryListByClauseAsync(p => p.isDelete == false && p.verifyStatus == 1, p => p.createTime, OrderByType.Desc, true, true);
            var distributions = await _coreCmsDistributionServices.QueryListByClauseAsync(p => p.isDelete == false && p.verifyStatus == 1 && p.profession == "校园代理", p => p.createTime, OrderByType.Desc, true, true);

            jm.data = new
            {

 CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs

@@ -639,7 +639,7 @@
            //获取商品分类
            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);

            var distributions = await _coreCmsDistributionServices.QueryListByClauseAsync(p => p.isDelete == false && p.verifyStatus == 1, p => p.createTime, OrderByType.Desc, true, true);
            var distributions = await _coreCmsDistributionServices.QueryListByClauseAsync(p => p.isDelete == false && p.verifyStatus == 1 && p.profession == "校园代理", p => p.createTime , OrderByType.Desc, true, true);

           var categoriesnew = departmentRecursion(0, categories,"--");

@@ -903,6 +903,19 @@
                return jm;
            }
            model.jintui = entity.jintui;
            if(model.jintui == 1)
            {
                model.tiaozhengbiaoti = "铺货数量";
            }
            else if (model.jintui == 2)
            {
                model.tiaozhengbiaoti = "退货数量";
            }
            else if (model.jintui == 3)
            {
                model.tiaozhengbiaoti = "调整数量";
            }

            jm.code = 0;
            jm.data = model;

@@ -934,7 +947,8 @@

                var puhuo = await _PuhuoServices.QueryByIdAsync(entity.id);
                var aaaa = puhuo.shoukuannums ?? 0;
                if ( puhuo.nums < (aaaa + entity.shoukuannums))
               
                if ( puhuo.nums < entity.shoukuannums)
                {
                    jm.msg = "收款数量大于铺货数量，不能提交";
                    return jm;
@@ -965,7 +979,8 @@
                puhuoShoukuan.upDataTime = DateTime.Now;
                jm = await _puhuoShoukuanServices.InsertAsync(puhuoShoukuan);


                puhuo.nums = puhuo.nums - entity.shoukuannums.Value;
                puhuo.amount = new decimal(puhuo.nums)  * puhuo.price;
                puhuo.upDataBy = _user.Name;
                puhuo.upDataTime = DateTime.Now;
                var sss = puhuo.shoukuannums ?? 0;

 CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/edit.html

@@ -1,7 +1,7 @@
<script type="text/html" template lay-done="layui.data.sendParams(d);">
    <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-Puhuo-editForm" id="LAY-app-Puhuo-editForm">
        <input type="hidden" name="id" value="{{d.params.data.id || '' }}" />
        <input type="hidden" name="jintui" value="{{d.params.data.jintui || '' }}" />
        <input type="hidden" id="jintui" name="jintui" value="{{d.params.data.jintui || '' }}" />
        
        <!--<div class="layui-form-item">
        <label for="id" class="layui-form-label  ">主键ID</label>
@@ -104,7 +104,7 @@
            </div>
        </div>
        <div class="layui-form-item">
            <label for="tiaozhengnums" class="layui-form-label  layui-form-required">调整数量</label>
            <label for="tiaozhengnums" class="layui-form-label  layui-form-required">{{d.params.data.tiaozhengbiaoti || '' }}</label>
            <div class="layui-input-block">
                <input type="number" min="0" max="999999" name="tiaozhengnums" lay-verType="tips" lay-verify="required|number" class="layui-input" value="0" placeholder="请输入数量" lay-reqText="请输入数量并为数字" />
            </div>
@@ -114,6 +114,9 @@
            <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-Puhuo-editForm-submit" id="LAY-app-Puhuo-editForm-submit" value="确认编辑">
        </div>
    </div>
  

   
</script>
<script>
    var debug= layui.setter.debug;
@@ -121,6 +124,7 @@
        //开启调试情况下获取接口赋值数据
        if (debug) { console.log(d.params.data); }
        layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg'],
          
        function () {
            var $ = layui.$
                , form = layui.form
@@ -129,7 +133,6 @@
                , upload = layui.upload
                , cropperImg = layui.cropperImg
                , coreHelper = layui.coreHelper;
        
            laydate.render({
                elem: '#editTime-Puhuo-createTime',
                type: 'datetime',
@@ -147,4 +150,9 @@
            form.render(null, 'LAY-app-Puhuo-editForm');
        })
    };

    
 
   

</script>

 CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/editshoukuan.html

@@ -117,7 +117,7 @@
        </div>

        <div class="layui-form-item">
            <label for="shoukuanamount" class="layui-form-label  layui-form-required">回款金额</label>
            <label for="shoukuanamount" class="layui-form-label ">回款金额</label>
            <div class="layui-input-block">
                <input type="number" min="0" max="999999" name="shoukuanamount" id="shoukuanamount" lay-verType="tips" readonly="readonly" lay-verify="required|number" class="layui-input" value="0" placeholder="请输入数量" lay-reqText="请输入数量并为数字" />
            </div>

 CoreCms.Net.Web.Admin/wwwroot/views/content/stock/products/index.html

@@ -132,7 +132,7 @@
                            //{ field: 'marketable', title: '是否上架', width: 95, templet: '#switch_marketable', sort: false, unresize: true },
                            { field: 'weight', title: '重量(千克)', sort: false, width: 80 },
                            { field: 'unit', title: '单位', sort: false, width: 60 },
                            { field: 'stock', title: '库存（单机编辑）', sort: false, width: 120, edit: 'text' },
                            { field: 'stock', title: '库存（单击编辑）', sort: false, width: 120, edit: 'text' },
                            {
                                field: 'freezeStock', title: '冻结库存', sort: false, width: 80, templet: function (data) {
                                    if (data.freezeStock > 0) {

 CoreCms.Net.Web.Admin/wwwroot/views/content/stock/stocks/details.html

@@ -56,9 +56,9 @@
                        //{ field: 'stockId', title: '关联单号', sort: false, width: 150 },
                        { field: 'goodsName', title: '商品名称', sort: false },
                        { field: 'spesDesc', title: '货品规格', sort: false },
                        { field: 'sn', title: '货品编码', sort: false, width: 130 },
                        { field: 'bn', title: '商品编码', sort: false, width: 130 },
                        { field: 'nums', title: '数量', sort: false, width: 60 },
                        { field: 'sn', title: '货品编码', sort: false, width: 180 },
                        { field: 'bn', title: '商品编码', sort: false, width: 180 },
                        { field: 'nums', title: '数量', sort: false, width: 100 },
                    ]
                ]
            });

 CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/Selectselectchakan.html

New file
@@ -0,0 +1,139 @@
<script type="text/html" template lay-done="layui.data.done(d);">
    <table class="layui-table layui-form" lay-filter="LAY-app-CoreCmsPlanOrder-detailsForm" id="LAY-app-CoreCmsPlanOrder-detailsForm">
        <colgroup>
            <col width="100">
            <col>
        </colgroup>
        <tbody>






            <tr>
                <td style="background-color:lightsteelblue;width:25%;">
                    商品名称
                </td>
                <td style="background-color: lightsteelblue; width: 25%;">
                    商品规格
                </td>
                <td style="background-color: lightsteelblue; width: 25%;">
                    计划数量
                </td>

                <td style="background-color: lightsteelblue; width: 25%;">
                    调整数量
                </td>

            </tr>

            {{# layui.each(d.params.data, function(index, item){ }}
            <tr>
                <td>
                    {{ item.name }}
                </td>
                <td>
                    {{ item.specification }}
                </td>
                <td>
                    {{ item.nums }}
                </td>

                <td>
                    {{ item.numsnew }}
                </td>

            </tr>
            {{# }); }}





            <!--<tr>
                 <td style="background-color:lightsteelblue;" colspan="4">
                     修改订单
                 </td>

             </tr>
            <tr>
                 <td style="background-color:lightsteelblue;">
                     商品名称
                 </td>
                 <td style="background-color:lightsteelblue;">
                     单价（元）
                 </td>
                 <td style="background-color:lightsteelblue;">
                     数量
                 </td>
                 <td style="background-color:lightsteelblue;">
                     总价（元）
                 </td>
             </tr>

             {{# layui.each(d.params.data.modelItem2, function(index, item){ }}
             <tr>
                 <td>
                     {{ item.name }}   {{ item.specification }}
                 </td>
                 <td>
                     {{ item.price }}
                 </td>
                 <td>
                     {{ item.nums }}
                 </td>
                 <td>
                     {{ item.amount }}
                 </td>
             </tr>
             {{# }); }}-->

        </tbody>
    </table>


    <div class="layui-form-item text-right">
        <input type="button" class="layui-btn"   value="打印" onclick="print()">
    </div>
</script>
<script>
    var debug= layui.setter.debug;
    layui.data.done = function (d) {
        //开启调试情况下获取接口赋值数据
        if (debug) { console.log(d.params.data); }

        layui.use(['admin', 'form', 'coreHelper'], function () {
            var $ = layui.$
                , setter = layui.setter
                , admin = layui.admin
                , coreHelper = layui.coreHelper
                , form = layui.form;
            form.render(null, 'LAY-app-CoreCmsPlanOrder-detailsForm');
        });
    };


    function print() {

        // 使用方法：
        // 假设你有一个id为"printSection"的HTML元素，你想打印这个元素的内容
       

        var v = document.createElement("div");
        $(v).append($("#LAY-app-CoreCmsPlanOrder-detailsForm").prop("outerHTML") + '<style type="text/css">table { width: 595px;border-collapse: collapse;} td {border:1px solid #F00 }</style></div>');

        var h = window.open("Print_window", "_blank");
        h.document.write($(v).prop("outerHTML"));
        h.document.close();
        h.print();
        h.close();
    }

   

    

   
    
</script>

 CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html

@@ -147,6 +147,7 @@
            <div class="layui-inline">
                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsPlanOrder-search"><i class="layui-icon layui-icon-search"></i>筛选</button>
                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-doBatchDelete"><i class="layui-icon layui-icon-add-circle"></i>批量锁单</button>
                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-selectchakan"><i class="layui-icon layui-icon-add-circle"></i>批量查看</button>
                <button type="button" class="layui-btn layui-btn-sm" id="upIndexPopupWindowImageUrlBtn">上传计划订单</button>
                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>选择导出</button>
                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>查询导出</button>
@@ -228,6 +229,14 @@
                        var checkStatus = table.checkStatus("LAY-app-CoreCmsPlanOrder-tableBox");
                        doSelectExportExcel(checkStatus);
                    });

                //监听搜索
                form.on('submit(LAY-app-selectchakan)',
                    function (data) {
                        var checkStatus = table.checkStatus("LAY-app-CoreCmsPlanOrder-tableBox");
                        doSelectselectchakan(checkStatus);
                    });

                //监听搜索
                form.on('submit(LAY-app-doBatchDelete)',
                    function (data) {
@@ -578,6 +587,41 @@
                                });
                        });
                }


                //执行选择目录导出数据
                function doSelectselectchakan(checkStatus) {
                    var checkData = checkStatus.data;
                    if (checkData.length === 0) {
                        return layer.msg('请选择您要查看的数据');
                    }
                    var delidsStr = [];
                    layui.each(checkData,
                        function (index, item) {
                            delidsStr.push(item.orderId);
                        });

                    coreHelper.Post("Api/CoreCmsPlanOrder/Selectselectchakan", { id: delidsStr }, function (e) {
                        if (e.code === 0) {
                            admin.popup({
                                shadeClose: false,
                                title: '查看详情',
                                area: ['1200px', '90%'],
                                id: 'LAY-popup-CoreCmsPlanOrder-details',
                                success: function (layero, index) {
                                    view(this.id).render('CoreCmsPlanOrder/Selectselectchakan', { data: e.data }).done(function () {
                                        form.render();
                                    });
                                    // 禁止弹窗出现滚动条
                                    /*   $(layero).children('.layui-layer-content').css('overflow', 'visible');*/
                                }
                            });
                        } else {
                            layer.msg(e.msg);
                        }
                    });                   
                }

                //执行选择目录导出数据
                function doSelectExportExcel(checkStatus){
                    var checkData = checkStatus.data;