From 3fc58aef2f6f47c4a356df23479e3becca630177 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 27 六月 2024 17:11:47 +0800
Subject: [PATCH] 铺货和计划订单的修改。计划订单增加批量查看
---
CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/Selectselectchakan.html | 139 +++++++++
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs | 541 ++++++++++++++++++++++++++---------
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs | 21 +
CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs | 7
CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/edit.html | 86 +++--
CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html | 46 +++
CoreCms.Net.Web.Admin/wwwroot/views/content/stock/products/index.html | 2
CoreCms.Net.Web.Admin/wwwroot/views/content/stock/stocks/details.html | 6
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/editshoukuan.html | 2
10 files changed, 662 insertions(+), 190 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs b/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs
index 06d7ba5..fcc3fa8 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs
+++ b/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 = "璋冩暣鏁伴噺")]
diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
index 46617dc..ba42d3f 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
+++ b/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();
+ //娣诲姞涓�涓猻heet
+ 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,131 +772,219 @@
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++;
+ rowTemp0.SetCellValue(listModel[i].orderId.ToString());
+ rowTemp0.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp1 = rowTemp.CreateCell(cellNumTemp);
- rowTemp1.SetCellValue(listModel[i].orderAmount.ToString());
- rowTemp1.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp1.SetCellValue(listModel[i].shi.ToString());
+ rowTemp1.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp2 = rowTemp.CreateCell(cellNumTemp);
- rowTemp2.SetCellValue(listModel[i].status.ToString());
- rowTemp2.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp2.SetCellValue(listModel[i].quxian.ToString());
+ rowTemp2.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp3 = rowTemp.CreateCell(cellNumTemp);
- rowTemp3.SetCellValue(listModel[i].userId.ToString());
- rowTemp3.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp3.SetCellValue(listModel[i].pianqu.ToString());
+ rowTemp3.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp4 = rowTemp.CreateCell(cellNumTemp);
- rowTemp4.SetCellValue(listModel[i].shipAddress.ToString());
- rowTemp4.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp4.SetCellValue(listModel[i].shipAddress.ToString());
+ rowTemp4.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp5 = rowTemp.CreateCell(cellNumTemp);
- rowTemp5.SetCellValue(listModel[i].shipName.ToString());
- rowTemp5.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp5.SetCellValue(listModel[i].shipName.ToString());
+ rowTemp5.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp6 = rowTemp.CreateCell(cellNumTemp);
- rowTemp6.SetCellValue(listModel[i].shipMobile.ToString());
- rowTemp6.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp6.SetCellValue(listModel[i].shipMobile.ToString());
+ rowTemp6.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp7 = rowTemp.CreateCell(cellNumTemp);
- rowTemp7.SetCellValue(listModel[i].oldOrderAmount.ToString());
- rowTemp7.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp7.SetCellValue(listModel[i].shouhuoAddress.ToString());
+ rowTemp7.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp8 = rowTemp.CreateCell(cellNumTemp);
- rowTemp8.SetCellValue(listModel[i].keYongAmount.ToString());
- rowTemp8.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp8.SetCellValue(listModel[i].oldOrderAmount.ToString());
+ rowTemp8.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp9 = rowTemp.CreateCell(cellNumTemp);
- rowTemp9.SetCellValue(listModel[i].createTime.ToString());
- rowTemp9.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp9.SetCellValue(listModel[i].orderAmount.ToString());
+ rowTemp9.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp10 = rowTemp.CreateCell(cellNumTemp);
- rowTemp10.SetCellValue(listModel[i].upDataTime.ToString());
- rowTemp10.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp10.SetCellValue(listModel[i].keYongAmount.ToString());
+ rowTemp10.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp11 = rowTemp.CreateCell(cellNumTemp);
- rowTemp11.SetCellValue(listModel[i].createBy.ToString());
- rowTemp11.CellStyle = commonCellStyle;
- cellNumTemp++;
+ 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.CellStyle = commonCellStyle;
- cellNumTemp++;
+ rowTemp12.SetCellValue(modelItem1[j].price.ToString());
+ rowTemp12.CellStyle = commonCellStyle;
+ cellNumTemp++;
var rowTemp13 = rowTemp.CreateCell(cellNumTemp);
- rowTemp13.SetCellValue(listModel[i].isdelete.ToString());
- rowTemp13.CellStyle = commonCellStyle;
- cellNumTemp++;
+ 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
@@ -876,8 +1030,26 @@
{
where = where.And(p => p.orderId.Contains(orderId));
}
- //璋冩暣璁㈠崟閲戦 decimal
- var orderAmount = Request.Form["orderAmount"].FirstOrDefault().ObjectToDecimal(0);
+ //甯� 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);
if (orderAmount > 0)
{
where = where.And(p => p.orderAmount == orderAmount);
@@ -993,170 +1165,257 @@
var headerRow = mySheet.CreateRow(0);
var headerStyle = ExcelHelper.GetHeaderStyle(book);
var cellNum = 0;
-
+
var cell0 = headerRow.CreateCell(cellNum);
cell0.SetCellValue("璁㈠崟鍙�");
cell0.CellStyle = headerStyle;
mySheet.SetColumnWidth(cellNum, 10 * 256);
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++;
-
+
var cell4 = headerRow.CreateCell(cellNum);
cell4.SetCellValue("瀛︽牎");
cell4.CellStyle = headerStyle;
mySheet.SetColumnWidth(cellNum, 10 * 256);
cellNum++;
-
+
var cell5 = headerRow.CreateCell(cellNum);
cell5.SetCellValue("鑱旂郴浜�");
cell5.CellStyle = headerStyle;
mySheet.SetColumnWidth(cellNum, 10 * 256);
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 rowTemp0 = rowTemp.CreateCell(cellNumTemp);
- rowTemp0.SetCellValue(listModel[i].orderId.ToString());
- rowTemp0.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == listModel[i].orderId && p.isOld == false, p => p.specification, OrderByType.Asc);
- var rowTemp1 = rowTemp.CreateCell(cellNumTemp);
- rowTemp1.SetCellValue(listModel[i].orderAmount.ToString());
- rowTemp1.CellStyle = commonCellStyle;
- cellNumTemp++;
- var rowTemp2 = rowTemp.CreateCell(cellNumTemp);
- rowTemp2.SetCellValue(listModel[i].status.ToString());
- rowTemp2.CellStyle = commonCellStyle;
- cellNumTemp++;
+ 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));
- var rowTemp3 = rowTemp.CreateCell(cellNumTemp);
- rowTemp3.SetCellValue(listModel[i].userId.ToString());
- rowTemp3.CellStyle = commonCellStyle;
- cellNumTemp++;
+ }
+ 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;
- var rowTemp4 = rowTemp.CreateCell(cellNumTemp);
- rowTemp4.SetCellValue(listModel[i].shipAddress.ToString());
- rowTemp4.CellStyle = commonCellStyle;
- cellNumTemp++;
+ 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 rowTemp5 = rowTemp.CreateCell(cellNumTemp);
- rowTemp5.SetCellValue(listModel[i].shipName.ToString());
- rowTemp5.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp1 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp1.SetCellValue(listModel[i].shi.ToString());
+ rowTemp1.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp6 = rowTemp.CreateCell(cellNumTemp);
- rowTemp6.SetCellValue(listModel[i].shipMobile.ToString());
- rowTemp6.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp2 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp2.SetCellValue(listModel[i].quxian.ToString());
+ rowTemp2.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp7 = rowTemp.CreateCell(cellNumTemp);
- rowTemp7.SetCellValue(listModel[i].oldOrderAmount.ToString());
- rowTemp7.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp3 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp3.SetCellValue(listModel[i].pianqu.ToString());
+ rowTemp3.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp8 = rowTemp.CreateCell(cellNumTemp);
- rowTemp8.SetCellValue(listModel[i].keYongAmount.ToString());
- rowTemp8.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp4 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp4.SetCellValue(listModel[i].shipAddress.ToString());
+ rowTemp4.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp9 = rowTemp.CreateCell(cellNumTemp);
- rowTemp9.SetCellValue(listModel[i].createTime.ToString());
- rowTemp9.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp5 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp5.SetCellValue(listModel[i].shipName.ToString());
+ rowTemp5.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp10 = rowTemp.CreateCell(cellNumTemp);
- rowTemp10.SetCellValue(listModel[i].upDataTime.ToString());
- rowTemp10.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp6 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp6.SetCellValue(listModel[i].shipMobile.ToString());
+ rowTemp6.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp11 = rowTemp.CreateCell(cellNumTemp);
- rowTemp11.SetCellValue(listModel[i].createBy.ToString());
- rowTemp11.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp7 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp7.SetCellValue(listModel[i].shouhuoAddress.ToString());
+ rowTemp7.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
- rowTemp12.SetCellValue(listModel[i].upDataBy.ToString());
- rowTemp12.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp8 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp8.SetCellValue(listModel[i].oldOrderAmount.ToString());
+ rowTemp8.CellStyle = commonCellStyle;
+ cellNumTemp++;
- var rowTemp13 = rowTemp.CreateCell(cellNumTemp);
- rowTemp13.SetCellValue(listModel[i].isdelete.ToString());
- rowTemp13.CellStyle = commonCellStyle;
- cellNumTemp++;
+ var rowTemp9 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp9.SetCellValue(listModel[i].orderAmount.ToString());
+ rowTemp9.CellStyle = commonCellStyle;
+ cellNumTemp++;
+
+ var rowTemp10 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp10.SetCellValue(listModel[i].keYongAmount.ToString());
+ rowTemp10.CellStyle = commonCellStyle;
+ cellNumTemp++;
+
+ var rowTemp11 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp11.SetCellValue(modelItem1[j].name.ToString() + modelItem1[j].specification.ToString());
+ rowTemp11.CellStyle = commonCellStyle;
+ cellNumTemp++;
+
+ var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
+ rowTemp12.SetCellValue(modelItem1[j].price.ToString());
+ rowTemp12.CellStyle = commonCellStyle;
+ cellNumTemp++;
+
+ var rowTemp13 = rowTemp.CreateCell(cellNumTemp);
+ 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++;
+ }
+
+
+
+
+
+
}
// 鍐欏叆鍒癳xcel
diff --git a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs
index d737776..f641727 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs
+++ b/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
{
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs
index da67438..452c445 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/PuhuoController.cs
+++ b/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;
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/edit.html
index fa15f5e..6c1b62c 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/edit.html
@@ -1,20 +1,20 @@
<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>
- <div class="layui-input-block">
- <input type="number" min="0" max="999999" name="id" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="璇疯緭鍏ヤ富閿甀D" lay-reqText="璇疯緭鍏ヤ富閿甀D骞朵负鏁板瓧" />
- </div>
- </div>-->
+ <label for="id" class="layui-form-label ">涓婚敭ID</label>
+ <div class="layui-input-block">
+ <input type="number" min="0" max="999999" name="id" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="璇疯緭鍏ヤ富閿甀D" lay-reqText="璇疯緭鍏ヤ富閿甀D骞朵负鏁板瓧" />
+ </div>
+ </div>-->
<!--<div class="layui-form-item">
- <label for="distributionId" class="layui-form-label ">缁忛攢鍟唅d</label>
- <div class="layui-input-block">
- <input type="number" min="0" max="999999" name="distributionId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.distributionId || '' }}" placeholder="璇疯緭鍏ョ粡閿�鍟唅d" lay-reqText="璇疯緭鍏ョ粡閿�鍟唅d骞朵负鏁板瓧" />
- </div>
- </div>-->
+ <label for="distributionId" class="layui-form-label ">缁忛攢鍟唅d</label>
+ <div class="layui-input-block">
+ <input type="number" min="0" max="999999" name="distributionId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.distributionId || '' }}" placeholder="璇疯緭鍏ョ粡閿�鍟唅d" lay-reqText="璇疯緭鍏ョ粡閿�鍟唅d骞朵负鏁板瓧" />
+ </div>
+ </div>-->
<div class="layui-form-item">
<label for="areaCodeName" class="layui-form-label ">鍖哄煙鍚嶇О</label>
<div class="layui-input-block">
@@ -29,17 +29,17 @@
</div>
<!--<div class="layui-form-item">
- <label for="areaCode" class="layui-form-label ">鍖哄煙</label>
- <div class="layui-input-block">
- <input name="areaCode" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ尯鍩�" lay-reqText="璇疯緭鍏ュ尯鍩�" value="{{d.params.data.areaCode || '' }}" />
- </div>
- </div>-->
+ <label for="areaCode" class="layui-form-label ">鍖哄煙</label>
+ <div class="layui-input-block">
+ <input name="areaCode" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ尯鍩�" lay-reqText="璇疯緭鍏ュ尯鍩�" value="{{d.params.data.areaCode || '' }}" />
+ </div>
+ </div>-->
<!--<div class="layui-form-item">
- <label for="CategoryId" class="layui-form-label ">鍟嗗搧鍒嗙被id</label>
- <div class="layui-input-block">
- <input type="number" min="0" max="999999" name="CategoryId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.CategoryId || '' }}" placeholder="璇疯緭鍏ュ晢鍝佸垎绫籭d" lay-reqText="璇疯緭鍏ュ晢鍝佸垎绫籭d骞朵负鏁板瓧" />
- </div>
- </div>-->
+ <label for="CategoryId" class="layui-form-label ">鍟嗗搧鍒嗙被id</label>
+ <div class="layui-input-block">
+ <input type="number" min="0" max="999999" name="CategoryId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.CategoryId || '' }}" placeholder="璇疯緭鍏ュ晢鍝佸垎绫籭d" lay-reqText="璇疯緭鍏ュ晢鍝佸垎绫籭d骞朵负鏁板瓧" />
+ </div>
+ </div>-->
<div class="layui-form-item">
<label for="CategoryName" class="layui-form-label ">鍟嗗搧鍒嗙被</label>
@@ -49,11 +49,11 @@
</div>
<!--<div class="layui-form-item">
- <label for="goodsId" class="layui-form-label ">鍟嗗搧id</label>
- <div class="layui-input-block">
- <input type="number" min="0" max="999999" name="goodsId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.goodsId || '' }}" placeholder="璇疯緭鍏ュ晢鍝乮d" lay-reqText="璇疯緭鍏ュ晢鍝乮d骞朵负鏁板瓧" />
- </div>
- </div>-->
+ <label for="goodsId" class="layui-form-label ">鍟嗗搧id</label>
+ <div class="layui-input-block">
+ <input type="number" min="0" max="999999" name="goodsId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.goodsId || '' }}" placeholder="璇疯緭鍏ュ晢鍝乮d" lay-reqText="璇疯緭鍏ュ晢鍝乮d骞朵负鏁板瓧" />
+ </div>
+ </div>-->
<div class="layui-form-item">
<label for="goodsName" class="layui-form-label ">鍟嗗搧鍚嶇О</label>
@@ -63,11 +63,11 @@
</div>
<!--<div class="layui-form-item">
- <label for="productsId" class="layui-form-label ">璐у搧id</label>
- <div class="layui-input-block">
- <input type="number" min="0" max="999999" name="productsId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.productsId || '' }}" placeholder="璇疯緭鍏ヨ揣鍝乮d" lay-reqText="璇疯緭鍏ヨ揣鍝乮d骞朵负鏁板瓧" />
- </div>
- </div>-->
+ <label for="productsId" class="layui-form-label ">璐у搧id</label>
+ <div class="layui-input-block">
+ <input type="number" min="0" max="999999" name="productsId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.productsId || '' }}" placeholder="璇疯緭鍏ヨ揣鍝乮d" lay-reqText="璇疯緭鍏ヨ揣鍝乮d骞朵负鏁板瓧" />
+ </div>
+ </div>-->
<div class="layui-form-item">
<label for="productsName" class="layui-form-label ">璐у搧缂栧彿</label>
@@ -77,11 +77,11 @@
</div>
<!--<div class="layui-form-item">
- <label for="spesDesc" class="layui-form-label ">璐у搧瑙勬牸</label>
- <div class="layui-input-block">
- <input name="spesDesc" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヨ揣鍝佽鏍�" lay-reqText="璇疯緭鍏ヨ揣鍝佽鏍�" value="{{d.params.data.spesDesc || '' }}" />
- </div>
- </div>-->
+ <label for="spesDesc" class="layui-form-label ">璐у搧瑙勬牸</label>
+ <div class="layui-input-block">
+ <input name="spesDesc" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヨ揣鍝佽鏍�" lay-reqText="璇疯緭鍏ヨ揣鍝佽鏍�" value="{{d.params.data.spesDesc || '' }}" />
+ </div>
+ </div>-->
<div class="layui-form-item">
<label for="price" class="layui-form-label ">鍗曚环</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>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/editshoukuan.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/editshoukuan.html
index c7b7621..3ee0dfc 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/editshoukuan.html
+++ b/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>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/stock/products/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/stock/products/index.html
index 27e187f..b0d871d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/stock/products/index.html
+++ b/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) {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/stock/stocks/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/stock/stocks/details.html
index a913589..23e23e6 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/stock/stocks/details.html
+++ b/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 },
]
]
});
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/Selectselectchakan.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/Selectselectchakan.html
new file mode 100644
index 0000000..489e02e
--- /dev/null
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/Selectselectchakan.html
@@ -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() {
+
+ // 浣跨敤鏂规硶锛�
+ // 鍋囪浣犳湁涓�涓猧d涓�"printSection"鐨凥TML鍏冪礌锛屼綘鎯虫墦鍗拌繖涓厓绱犵殑鍐呭
+
+
+ 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>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
index d80091b..e91842f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
+++ b/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) {
@@ -577,7 +586,42 @@
}
});
});
- }
+ }
+
+
+ //鎵ц閫夋嫨鐩綍瀵煎嚭鏁版嵁
+ 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;
--
Gitblit v1.9.1