diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
index b45c55b6..37a2af53 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
@@ -6,6 +6,7 @@ using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
+using ZR.Model.mes.md.DTO;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
@@ -47,10 +48,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
return SUCCESS(units);
}
- ///
- /// 获取全部单位
- ///
- ///
+ ///
+ /// 获取全部单位
+ ///
+ ///
[HttpGet("getUnit")]
public IActionResult GetUnitlist()
{
@@ -73,7 +74,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
int result = mdProduct.InsertProductDefine(products);
return SUCCESS(result);
}
-
+
///
/// 根据主键查询product
@@ -96,14 +97,20 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
[HttpPost("updateProductDefine")]
public IActionResult UpdateProductDefine([FromBody] MdProductDefine products)
{
+ if (products != null)
+ products.ToUpdate(HttpContext);
- int result= mdProduct.UpdateProductDefine(products);
+ int result = mdProduct.UpdateProductDefine(products);
return SUCCESS(result);
}
-
+ ///
+ /// 删除产品
+ ///
+ ///
+ ///
[HttpDelete("delproduct/{id}")]
public IActionResult DelUnit(string id)
@@ -112,6 +119,28 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
int result = mdProduct.deleteProductDefine(ids);
return ToResponse(result);
}
+
+
+ ///
+ /// 导出产品excel
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ [HttpGet("exportProduct")]
+ public IActionResult ExportProduct(DateTime starttime, DateTime endtime, string productCode="", string productName = "")
+ {
+ List units = null;
+
+ units = mdProduct.GetList(starttime, endtime, productCode, productName);
+
+
+ var result = ExportExcelMini(units, "pruduct", "产品列表");
+ return ExportExcel(result.Item2, result.Item1);
+
+ }
}
}
diff --git a/ZR.Service/mes/md/IService/IMdProductDefineService.cs b/ZR.Service/mes/md/IService/IMdProductDefineService.cs
index 6b044afb..9f57b1c4 100644
--- a/ZR.Service/mes/md/IService/IMdProductDefineService.cs
+++ b/ZR.Service/mes/md/IService/IMdProductDefineService.cs
@@ -12,7 +12,7 @@ namespace ZR.Service.mes.md.IService
{
public int deleteProductDefine(int[] ids);
public MdProductDefineDTO GetList(string name, string code, int pageNum, int pageSize);
- public List GetList(SearchOptionDTO searchOption);
+ public List GetList(DateTime starttime, DateTime endtime, string productCode, string productName);
public MdProductDefine GetProductDefinebyPK(int measure);
List GetProductDefineList(string name);
List GetProductDefineList();
diff --git a/ZR.Service/mes/md/MdProductDefineService.cs b/ZR.Service/mes/md/MdProductDefineService.cs
index f04665ca..2e2114c7 100644
--- a/ZR.Service/mes/md/MdProductDefineService.cs
+++ b/ZR.Service/mes/md/MdProductDefineService.cs
@@ -12,6 +12,7 @@ using System.Xml.Linq;
using ZR.Model.mes.md;
using ZR.Model.mes.md.DTO;
using ZR.Service.mes.md.IService;
+using static Org.BouncyCastle.Crypto.Engines.SM2Engine;
namespace ZR.Service.mes.md
{
@@ -49,6 +50,17 @@ namespace ZR.Service.mes.md
}
+ public List GetList(DateTime starttime, DateTime endtime, string productCode, string productName)
+ {
+
+ var predicate = Expressionable.Create()
+ .AndIF(productCode.IsNotEmpty(), pro => pro.ProductCode.Contains(productCode))
+ .AndIF(productName.IsNotEmpty(), pro => pro.ProductName.Contains(productName))
+ .AndIF(starttime.IsNotEmpty(), pro => pro.CreatedTime>=starttime)
+ .AndIF(endtime.IsNotEmpty(), pro => pro.CreatedTime>=endtime)
+ .ToExpression();
+ return Context.Queryable().Where(predicate).ToList();
+ }
public MdProductDefine GetProductDefinebyPK(int measure)
{
@@ -84,10 +96,7 @@ namespace ZR.Service.mes.md
return Update(paramss,true);
}
- List IMdProductDefineService.GetList(SearchOptionDTO searchOption)
- {
- throw new NotImplementedException();
- }
+
}
diff --git a/ZR.Vue/src/api/basisManagement/productEfinition.js b/ZR.Vue/src/api/basisManagement/productEfinition.js
index c5dc0d88..a08a915c 100644
--- a/ZR.Vue/src/api/basisManagement/productEfinition.js
+++ b/ZR.Vue/src/api/basisManagement/productEfinition.js
@@ -1,66 +1,63 @@
import request from '@/utils/request'
import { downFile } from '@/utils/request'
-
export function listproductEfinition(query) {
- return request({
- url: '/mes/md/product/list',
- method: 'get',
- params: query
- })
- }
+ return request({
+ url: '/mes/md/product/list',
+ method: 'get',
+ params: query,
+ })
+}
-
- //根据名称查询单条unit
- export function getUnitmeasure(query) {
- return request({
- url: '/mes/md/product/getUnit/'+query,
- method: 'get',
-
- })
- }
-
- export function updateUnitmeasure(data) {
- return request({
- url: '/mes/md/unit/updateUnit',
- method: 'post',
- data: data
- })
- }
+//根据名称查询单条unit
+export function getUnitmeasure(query) {
+ return request({
+ url: '/mes/md/product/getUnit/' + query,
+ method: 'get',
+ })
+}
- export function addProductDefine(data) {
- return request({
- url: '/mes/md/product/addProductDefine',
- method: 'post',
- data: data,
- contextType:"application/json"
- })
- }
-
- export function updateProductDefine(data) {
- return request({
- url: '/mes/md/product/updateProductDefine',
- method: 'post',
- data: data,
- contextType:"application/json"
- })
- }
+export function updateUnitmeasure(data) {
+ return request({
+ url: '/mes/md/unit/updateUnit',
+ method: 'post',
+ data: data,
+ })
+}
-
+export function addProductDefine(data) {
+ return request({
+ url: '/mes/md/product/addProductDefine',
+ method: 'post',
+ data: data,
+ contextType: 'application/json',
+ })
+}
- export function getProductBypk(query) {
- return request({
- url: '/mes/md/product/getProductBypk/'+query,
- method: 'get',
-
- })
- }
+export function updateProductDefine(data) {
+ return request({
+ url: '/mes/md/product/updateProductDefine',
+ method: 'post',
+ data: data,
+ contextType: 'application/json',
+ })
+}
-
-
- export function delproduct(id) {
- return request({
- url: '/mes/md/product/delproduct/'+id,
- method: 'delete',
- })
- }
+export function getProductBypk(query) {
+ return request({
+ url: '/mes/md/product/getProductBypk/' + query,
+ method: 'get',
+ })
+}
+
+export function delproduct(id) {
+ return request({
+ url: '/mes/md/product/delproduct/' + id,
+ method: 'delete',
+ })
+}
+
+// 导出产品
+export async function exportProduct(query) {
+ await downFile('/mes/md/product/exportProduct/', { ...query })
+}
diff --git a/ZR.Vue/src/views/basisManagement/productEfinition.vue b/ZR.Vue/src/views/basisManagement/productEfinition.vue
index 04de607f..d0b0e09c 100644
--- a/ZR.Vue/src/views/basisManagement/productEfinition.vue
+++ b/ZR.Vue/src/views/basisManagement/productEfinition.vue
@@ -78,7 +78,7 @@
-
+
+
+
+
+
+
+