Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

打标签2号机器添加门把手临时标签，统计总数时去除临时标签。

Browse Source
This commit is contained in:
赵正易
2024-07-09 13:47:37 +08:00
parent 0006652244
commit 5d42e9e196
3 changed files with 188 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs
View File

@@ -23,6 +23,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.wms
/// <param name="original"></param> /// <param name="original"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("common")] [HttpGet("common")]
[Log(Title = "退库", BusinessType = BusinessType.DELETE)]
public IActionResult ExitwarehouseCommmon(string originalCode) public IActionResult ExitwarehouseCommmon(string originalCode)
{ {
string msg = null; string msg = null;

2
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsActionController.cs
View File

@@ -80,7 +80,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("doConsolidationGoods2")] [HttpPost("doConsolidationGoods2")]
[Log(Title = "拼箱", BusinessType = BusinessType.UPDATE)] [Log(Title = "拼箱2", BusinessType = BusinessType.UPDATE)]
public IActionResult DoConsolidationGoods2([FromBody] WmGoodsConsolidationDto2 parm) public IActionResult DoConsolidationGoods2([FromBody] WmGoodsConsolidationDto2 parm)
{ {
try try

279
ZR.Service/mes/qc/CommonFQCService.cs
View File

@@ -1,10 +1,10 @@
using Infrastructure.Attribute; using System;
using SqlSugar;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Infrastructure.Attribute;
using SqlSugar;
using ZR.Model; using ZR.Model;
using ZR.Model.MES.pro; using ZR.Model.MES.pro;
using ZR.Model.MES.qc; using ZR.Model.MES.qc;
@@ -16,8 +16,6 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Service.mes.qc namespace ZR.Service.mes.qc
{ {
[AppService(ServiceType = typeof(ICommonFQCService), ServiceLifetime = LifeTime.Transient)] [AppService(ServiceType = typeof(ICommonFQCService), ServiceLifetime = LifeTime.Transient)]
public class CommonFQCService : BaseService<FirstFQCService>, ICommonFQCService public class CommonFQCService : BaseService<FirstFQCService>, ICommonFQCService
{ {
@@ -26,9 +24,10 @@ namespace ZR.Service.mes.qc
try try
{ {
// 检查对应工单是否存在 // 检查对应工单是否存在
ProWorkorder_v2 proWorkorder = Context.Queryable<ProWorkorder_v2>() ProWorkorder_v2 proWorkorder = Context
.Where(it => it.ClientWorkorder == workOrderId) .Queryable<ProWorkorder_v2>()
.First(); .Where(it => it.ClientWorkorder == workOrderId)
.First();
if (proWorkorder == null) if (proWorkorder == null)
{ {
return -1; return -1;
@@ -40,6 +39,7 @@ namespace ZR.Service.mes.qc
return -1; return -1;
} }
} }
/// <summary> /// <summary>
/// 根据年周日生成当日全部工单列表 /// 根据年周日生成当日全部工单列表
/// </summary> /// </summary>
@@ -49,35 +49,46 @@ namespace ZR.Service.mes.qc
/// <param name="type">0-不读取status 1-读取status 2- 查询status为1,2时</param> /// <param name="type">0-不读取status 1-读取status 2- 查询status为1,2时</param>
/// <param name="status">-1-全部 0-初态 1-上线 2-包装完成</param> /// <param name="status">-1-全部 0-初态 1-上线 2-包装完成</param>
/// <returns></returns> /// <returns></returns>
public List<ProWorkorder_v2> GenerateWorkOrderListUtil(int year, int week, int date, int type = 0, int status = -1) public List<ProWorkorder_v2> GenerateWorkOrderListUtil(
int year,
int week,
int date,
int type = 0,
int status = -1
)
{ {
try try
{ {
var predicate = Expressionable.Create<ProWorkorder_v2>() var predicate = Expressionable
.And(it => it.Year == year) .Create<ProWorkorder_v2>()
.And(it => it.Week == week) .And(it => it.Year == year)
.And(it => it.Date == date) .And(it => it.Week == week)
.And(it => it.Remark3 == "是") .And(it => it.Date == date)
.AndIF(type == 1, it => it.Status == status) .And(it => it.Remark3 == "是")
.AndIF(type == 2, it => it.Status == 1 || it.Status == 2) .AndIF(type == 1, it => it.Status == status)
.ToExpression(); .AndIF(type == 2, it => it.Status == 1 || it.Status == 2)
return Context.Queryable<ProWorkorder_v2>() .ToExpression();
.Where(predicate) return Context
.OrderBy(it => it.Sort) .Queryable<ProWorkorder_v2>()
.ToList(); .Where(predicate)
.OrderBy(it => it.Sort)
.ToList();
} }
catch (Exception ex) catch (Exception ex)
{ {
return null; return null;
} }
} }
public int CheckPackageWorkOrderInListStatus(string workOrderId) public int CheckPackageWorkOrderInListStatus(string workOrderId)
{ {
try try
{ {
// 检查对应工单是否存在 // 检查对应工单是否存在
ProWorkorder_v2 proWorkOrder = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workOrderId).First(); ProWorkorder_v2 proWorkOrder = Context
.Queryable<ProWorkorder_v2>()
.Where(it => it.ClientWorkorder == workOrderId)
.First();
if (proWorkOrder == null) if (proWorkOrder == null)
{ {
return -1; return -1;
@@ -86,7 +97,12 @@ namespace ZR.Service.mes.qc
int year = proWorkOrder.Year; int year = proWorkOrder.Year;
int week = proWorkOrder.Week; int week = proWorkOrder.Week;
int date = proWorkOrder.Date; int date = proWorkOrder.Date;
List<ProWorkorder_v2> proWorkorders = GenerateWorkOrderListUtil(year, week, date, 2); List<ProWorkorder_v2> proWorkorders = GenerateWorkOrderListUtil(
year,
week,
date,
2
);
if (proWorkorders == null) if (proWorkorders == null)
{ {
return -1; return -1;
@@ -97,7 +113,8 @@ namespace ZR.Service.mes.qc
{ {
if (workOrderId == proWorkorders[i].ClientWorkorder) if (workOrderId == proWorkorders[i].ClientWorkorder)
{ {
index = i; break; index = i;
break;
} }
} }
if (index == 0) if (index == 0)
@@ -139,7 +156,10 @@ namespace ZR.Service.mes.qc
// 未完成 // 未完成
int noFinishNum = 0; int noFinishNum = 0;
// 检查对应工单是否存在 // 检查对应工单是否存在
ProWorkorder_v2 proWorkOrder = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workOrderId).First(); ProWorkorder_v2 proWorkOrder = Context
.Queryable<ProWorkorder_v2>()
.Where(it => it.ClientWorkorder == workOrderId)
.First();
if (proWorkOrder == null) if (proWorkOrder == null)
{ {
return result; return result;
@@ -148,7 +168,12 @@ namespace ZR.Service.mes.qc
int year = proWorkOrder.Year; int year = proWorkOrder.Year;
int week = proWorkOrder.Week; int week = proWorkOrder.Week;
int date = proWorkOrder.Date; int date = proWorkOrder.Date;
List<ProWorkorder_v2> proWorkorders = GenerateWorkOrderListUtil(year, week, date, 2); List<ProWorkorder_v2> proWorkorders = GenerateWorkOrderListUtil(
year,
week,
date,
2
);
if (proWorkorders == null) if (proWorkorders == null)
{ {
return result; return result;
@@ -159,10 +184,17 @@ namespace ZR.Service.mes.qc
{ {
if (workOrderId == proWorkorders[i].ClientWorkorder) if (workOrderId == proWorkorders[i].ClientWorkorder)
{ {
index = i + 1; break; index = i + 1;
break;
} }
} }
List<ProWorkorder_v2> finishWorkorders = GenerateWorkOrderListUtil(year, week, date, 1, 2); List<ProWorkorder_v2> finishWorkorders = GenerateWorkOrderListUtil(
year,
week,
date,
1,
2
);
if (finishWorkorders == null) if (finishWorkorders == null)
{ {
return result; return result;
@@ -182,6 +214,7 @@ namespace ZR.Service.mes.qc
return null; return null;
} }
} }
/// <summary> /// <summary>
/// 工单需要打印标签总数 /// 工单需要打印标签总数
/// </summary> /// </summary>
@@ -192,14 +225,16 @@ namespace ZR.Service.mes.qc
{ {
try try
{ {
ProWorkorder_v2 workOrder = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workOrderId).First(); ProWorkorder_v2 workOrder = Context
var res = Context.Queryable<QcFirstinspectionRecord>() .Queryable<ProWorkorder_v2>()
.Where(it => it.ClientWorkorder == workOrderId)
.First();
var res = Context
.Queryable<QcFirstinspectionRecord>()
.Where(it => it.FKWorkorderId.Equals(workOrderId)) .Where(it => it.FKWorkorderId.Equals(workOrderId))
.GroupBy(it => it.FKWorkorderId) .GroupBy(it => it.FKWorkorderId)
.Select(it => new .Select(it => new { sum = SqlFunc.AggregateSum(it.Counter ?? 0) })
{ .First();
sum = SqlFunc.AggregateSum(it.Counter ?? 0)
}).First();
if (res == null) if (res == null)
{ {
return workOrder.PreviousNumber; return workOrder.PreviousNumber;
@@ -214,6 +249,7 @@ namespace ZR.Service.mes.qc
return 0; return 0;
} }
} }
/// <summary> /// <summary>
/// 工单已打印标签数 /// 工单已打印标签数
/// </summary> /// </summary>
@@ -223,36 +259,47 @@ namespace ZR.Service.mes.qc
{ {
try try
{ {
string[] Machines = new string[] {"0","1","2","3" }; string[] Machines = new string[] { "0", "1", "2", "3" };
return Context.Queryable<WmPackingrecord>() return Context
.Where(it => it.WorkOrderNum == workOrderId) .Queryable<WmPackingrecord>()
.Where(it => Machines.Contains(it.Machine)) .Where(it => it.WorkOrderNum == workOrderId)
.OrderBy(it => it.Id) .Where(it => Machines.Contains(it.Machine))
.Count(); .Where(it => it.Standby3 == null)
.OrderBy(it => it.Id)
.Count();
} }
catch (Exception ex) catch (Exception ex)
{ {
return 0; return 0;
} }
} }
public QcCommonFqcBoardDto GetWorkOrderBoardData(string workOrderId) public QcCommonFqcBoardDto GetWorkOrderBoardData(string workOrderId)
{ {
try try
{ {
// 检查对应工单是否存在 // 检查对应工单是否存在
ProWorkorder_v2 proWorkOrder = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workOrderId).First(); ProWorkorder_v2 proWorkOrder = Context
.Queryable<ProWorkorder_v2>()
.Where(it => it.ClientWorkorder == workOrderId)
.First();
if (proWorkOrder == null) if (proWorkOrder == null)
{ {
return null; return null;
} }
// //
QcCommonFqcBoardDto boardData = new QcCommonFqcBoardDto(); QcCommonFqcBoardDto boardData = new QcCommonFqcBoardDto();
boardData.WorkOrderId = workOrderId; boardData.WorkOrderId = workOrderId;
// 提取工单年周日,组成数组 // 提取工单年周日,组成数组
int year = proWorkOrder.Year; int year = proWorkOrder.Year;
int week = proWorkOrder.Week; int week = proWorkOrder.Week;
int date = proWorkOrder.Date; int date = proWorkOrder.Date;
List<ProWorkorder_v2> proWorkorders = GenerateWorkOrderListUtil(year, week, date, 2); List<ProWorkorder_v2> proWorkorders = GenerateWorkOrderListUtil(
year,
week,
date,
2
);
if (proWorkorders == null) if (proWorkorders == null)
{ {
return null; return null;
@@ -263,27 +310,44 @@ namespace ZR.Service.mes.qc
{ {
if (workOrderId == proWorkorders[i].ClientWorkorder) if (workOrderId == proWorkorders[i].ClientWorkorder)
{ {
boardData.WorkOrderIndex = i + 1; break; boardData.WorkOrderIndex = i + 1;
break;
} }
} }
boardData.WorkOrderPackageCount = GetWorkOrderNeedPackingTotal(workOrderId); boardData.WorkOrderPackageCount = GetWorkOrderNeedPackingTotal(workOrderId);
boardData.WorkOrderFinishPackageNum = GetWorkOrderPackingrecordCount(workOrderId); boardData.WorkOrderFinishPackageNum = GetWorkOrderPackingrecordCount(workOrderId);
boardData.WorkOrderNotFinishPackageNum = boardData.WorkOrderPackageCount - boardData.WorkOrderFinishPackageNum; boardData.WorkOrderNotFinishPackageNum =
boardData.WorkOrderPackageCount - boardData.WorkOrderFinishPackageNum;
// 如果不是第一个工单，找到上一个工单号 // 如果不是第一个工单，找到上一个工单号
if (boardData.WorkOrderIndex > 1) if (boardData.WorkOrderIndex > 1)
{ {
boardData.LastWorkOrderId = proWorkorders[(boardData.WorkOrderIndex - 2) ?? 0].ClientWorkorder; boardData.LastWorkOrderId = proWorkorders[
boardData.LastWorkOrderPackageCount = GetWorkOrderNeedPackingTotal(boardData.LastWorkOrderId); (boardData.WorkOrderIndex - 2) ?? 0
boardData.LastWorkOrderFinishPackageNum = GetWorkOrderPackingrecordCount(boardData.LastWorkOrderId); ].ClientWorkorder;
boardData.LastWorkOrderNotFinishPackageNum = boardData.LastWorkOrderPackageCount - boardData.LastWorkOrderFinishPackageNum; boardData.LastWorkOrderPackageCount = GetWorkOrderNeedPackingTotal(
boardData.LastWorkOrderId
);
boardData.LastWorkOrderFinishPackageNum = GetWorkOrderPackingrecordCount(
boardData.LastWorkOrderId
);
boardData.LastWorkOrderNotFinishPackageNum =
boardData.LastWorkOrderPackageCount
- boardData.LastWorkOrderFinishPackageNum;
} }
List<ProWorkorder_v2> finishWorkorders = GenerateWorkOrderListUtil(year, week, date, 1, 2); List<ProWorkorder_v2> finishWorkorders = GenerateWorkOrderListUtil(
year,
week,
date,
1,
2
);
if (finishWorkorders == null) if (finishWorkorders == null)
{ {
return null; return null;
} }
boardData.WorkOrderFinishNum = finishWorkorders.Count; boardData.WorkOrderFinishNum = finishWorkorders.Count;
boardData.WorkOrderNotFinishNum = boardData.WorkOrderDayListCount - boardData.WorkOrderFinishNum; boardData.WorkOrderNotFinishNum =
boardData.WorkOrderDayListCount - boardData.WorkOrderFinishNum;
boardData.UpdatedTime = DateTime.Now; boardData.UpdatedTime = DateTime.Now;
return boardData; return boardData;
} }
@@ -293,7 +357,9 @@ namespace ZR.Service.mes.qc
} }
} }
public PagedInfo<QcCommonFqcWorkerOrderDataDto> GetWorkOrderFqcData(QcCommonFqcWorkerOrderDataQuery query) public PagedInfo<QcCommonFqcWorkerOrderDataDto> GetWorkOrderFqcData(
QcCommonFqcWorkerOrderDataQuery query
)
{ {
try try
{ {
@@ -306,7 +372,11 @@ namespace ZR.Service.mes.qc
DateTime dateTime = query.StartTime ?? DateTime.Now; DateTime dateTime = query.StartTime ?? DateTime.Now;
GregorianCalendar gregorianCalendar = new GregorianCalendar(); GregorianCalendar gregorianCalendar = new GregorianCalendar();
year = gregorianCalendar.GetYear(dateTime); year = gregorianCalendar.GetYear(dateTime);
week = gregorianCalendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Monday); week = gregorianCalendar.GetWeekOfYear(
dateTime,
CalendarWeekRule.FirstDay,
DayOfWeek.Monday
);
date = (int)gregorianCalendar.GetDayOfWeek(dateTime); date = (int)gregorianCalendar.GetDayOfWeek(dateTime);
if (date == 0) if (date == 0)
{ {
@@ -319,33 +389,49 @@ namespace ZR.Service.mes.qc
{ {
isCheckData = false; isCheckData = false;
} }
var predicate = Expressionable.Create<ProWorkorder_v2>() var predicate = Expressionable
.AndIF(isCheckData, it => it.Year == year) .Create<ProWorkorder_v2>()
.AndIF(isCheckData, it => it.Week == week) .AndIF(isCheckData, it => it.Year == year)
.AndIF(isCheckData, it => it.Date == date) .AndIF(isCheckData, it => it.Week == week)
.And(it => it.Remark3 == "是") .AndIF(isCheckData, it => it.Date == date)
.AndIF(query.Status > -1, it => it.Status == query.Status) .And(it => it.Remark3 == "是")
.AndIF(!string.IsNullOrEmpty(query.WorkOrderId), it => it.ClientWorkorder.Contains(query.WorkOrderId)) .AndIF(query.Status > -1, it => it.Status == query.Status)
.AndIF(!string.IsNullOrEmpty(query.Partnumber), it => it.FinishedPartNumber.Contains(query.Partnumber)) .AndIF(
.AndIF(!string.IsNullOrEmpty(query.Description), it => it.ProductDescription.Contains(query.Description) || it.Colour.Contains(query.Description) || !string.IsNullOrEmpty(query.WorkOrderId),
it.Specifications.Contains(query.Description)) it => it.ClientWorkorder.Contains(query.WorkOrderId)
.ToExpression(); )
List<ProWorkorder_v2> orderList = Context.Queryable<ProWorkorder_v2>() .AndIF(
.Where(predicate) !string.IsNullOrEmpty(query.Partnumber),
.OrderBy(it => it.Sort) it => it.FinishedPartNumber.Contains(query.Partnumber)
.ToList(); )
.AndIF(
!string.IsNullOrEmpty(query.Description),
it =>
it.ProductDescription.Contains(query.Description)
|| it.Colour.Contains(query.Description)
|| it.Specifications.Contains(query.Description)
)
.ToExpression();
List<ProWorkorder_v2> orderList = Context
.Queryable<ProWorkorder_v2>()
.Where(predicate)
.OrderBy(it => it.Sort)
.ToList();
//TODO 分页暂不实现 //TODO 分页暂不实现
//转换数据 //转换数据
PagedInfo<QcCommonFqcWorkerOrderDataDto> resultPage = new PagedInfo<QcCommonFqcWorkerOrderDataDto>(); PagedInfo<QcCommonFqcWorkerOrderDataDto> resultPage =
List<QcCommonFqcWorkerOrderDataDto> resultList = new List<QcCommonFqcWorkerOrderDataDto>(); new PagedInfo<QcCommonFqcWorkerOrderDataDto>();
List<QcCommonFqcWorkerOrderDataDto> resultList =
new List<QcCommonFqcWorkerOrderDataDto>();
foreach (var item in orderList) foreach (var item in orderList)
{ {
if (item != null) if (item != null)
{ {
string Remark = ""; string Remark = "";
WmMaterial material = Context.Queryable<WmMaterial>() WmMaterial material = Context
.Queryable<WmMaterial>()
.Where(it => it.Partnumber == item.FinishedPartNumber) .Where(it => it.Partnumber == item.FinishedPartNumber)
.First(); .First();
string Description = ""; string Description = "";
@@ -362,7 +448,8 @@ namespace ZR.Service.mes.qc
Remark += "物料不在清单内 "; Remark += "物料不在清单内 ";
} }
// 首检报表数据拉取 // 首检报表数据拉取
QcQualityStatisticsFirst QcFirstData = Context.Queryable<QcQualityStatisticsFirst>() QcQualityStatisticsFirst QcFirstData = Context
.Queryable<QcQualityStatisticsFirst>()
.Where(it => it.WorkorderId == item.ClientWorkorder) .Where(it => it.WorkorderId == item.ClientWorkorder)
.First(); .First();
string Team = ""; string Team = "";
@@ -378,32 +465,38 @@ namespace ZR.Service.mes.qc
Remark += "工单开始时间为空 "; Remark += "工单开始时间为空 ";
} }
} }
int WorkOrderPackageCount = GetWorkOrderNeedPackingTotal(item.ClientWorkorder); int WorkOrderPackageCount = GetWorkOrderNeedPackingTotal(
int WorkOrderFinishPackageNum = GetWorkOrderPackingrecordCount(item.ClientWorkorder); item.ClientWorkorder
int WorkOrderNotFinishPackageNum = WorkOrderPackageCount - WorkOrderFinishPackageNum; );
int WorkOrderFinishPackageNum = GetWorkOrderPackingrecordCount(
item.ClientWorkorder
);
int WorkOrderNotFinishPackageNum =
WorkOrderPackageCount - WorkOrderFinishPackageNum;
if (WorkOrderNotFinishPackageNum < 0) if (WorkOrderNotFinishPackageNum < 0)
{ {
WorkOrderNotFinishPackageNum = 0; WorkOrderNotFinishPackageNum = 0;
} }
bool IsFinish = WorkOrderNotFinishPackageNum == 0; bool IsFinish = WorkOrderNotFinishPackageNum == 0;
QcCommonFqcWorkerOrderDataDto newItem = new() QcCommonFqcWorkerOrderDataDto newItem =
{ new()
WorkOrderId = item.ClientWorkorder, {
Partnumber = item.FinishedPartNumber, WorkOrderId = item.ClientWorkorder,
Description = Description, Partnumber = item.FinishedPartNumber,
Color = Color, Description = Description,
Specification = Specification, Color = Color,
Team = Team, Specification = Specification,
StartTime = startTime, Team = Team,
EndTime = endTime, StartTime = startTime,
Status = item.Status, EndTime = endTime,
Remark = Remark, Status = item.Status,
IsFinish = IsFinish, Remark = Remark,
WorkOrderPackageCount = WorkOrderPackageCount, IsFinish = IsFinish,
WorkOrderFinishPackageNum = WorkOrderFinishPackageNum, WorkOrderPackageCount = WorkOrderPackageCount,
WorkOrderNotFinishPackageNum = WorkOrderNotFinishPackageNum WorkOrderFinishPackageNum = WorkOrderFinishPackageNum,
}; WorkOrderNotFinishPackageNum = WorkOrderNotFinishPackageNum
};
resultList.Add(newItem); resultList.Add(newItem);
} }
} }