ZZY/shanghaigangxiangtuzhuangMES
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首检添加数据看板

Browse Source
This commit is contained in:
赵正易
2024-06-07 11:04:26 +08:00
parent c93711290e
commit 769d2da1e0
344 changed files with 1772 additions and 2526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
View File

@@ -1,21 +1,11 @@
using Infrastructure.Extensions;
using JinianNet.JNTemplate;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using Model.DBModel;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SqlSugar;
using System.Text.Json;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.pro;
using ZR.Model.MES.pro.DTO;
using ZR.Service.mes.pro;
using ZR.Service.mes.pro.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.mes.pro
{
@@ -44,7 +34,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
return ToResponse(new ApiResult(200, "success", data));
}
[HttpGet("getWorkoderList_piliang")]
@@ -148,7 +138,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
item.Date = date;
}
var final_list = list.Where(it => !it.BlankNumber.Contains("圈数"))
.Where(it => !(it.BlankNumber == "" && it.FinishedPartNumber == "" && it.ProductDescription == "" && it.Specifications == "" && it.CylinderNumber == "" && it.Remark1 == "" && it.Remark2== "" && it.Remark3 == "" && it.Remark4== ""&&it.ClientWorkorder==""))
.Where(it => !(it.BlankNumber == "" && it.FinishedPartNumber == "" && it.ProductDescription == "" && it.Specifications == "" && it.CylinderNumber == "" && it.Remark1 == "" && it.Remark2 == "" && it.Remark3 == "" && it.Remark4 == "" && it.ClientWorkorder == ""))
.ToList();
string result = proWorkorderService.ImportExceldata(final_list);
@@ -271,8 +261,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
{
data = proWorkorderService.UpdateworkorderSort(id, (int)sort);
}
return ToResponse(new ApiResult(200, "success", data));
@@ -290,7 +280,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
public IActionResult UpdateSort2(string oldId, int oldSort, string newId, int newSort)
{
int result = 0;
if (string.IsNullOrEmpty(oldId)&& string.IsNullOrEmpty(newId))
if (string.IsNullOrEmpty(oldId) && string.IsNullOrEmpty(newId))
{
return ToResponse(new ApiResult(400, "updateSortError", "排序参数异常"));
}