Qubot/EasyMES
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

细节优化，及数据增加

Browse Source
This commit is contained in:
12888491 2022-10-21 15:00:44 +08:00
parent 0baab4adf3
commit 8906b4fd30
13 changed files with 4593 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
WaterCloud.Domain/Entity/MaterialManage/BadMaterialEntity.cs
View File

@ -1,80 +0,0 @@
using System;
using System.ComponentModel.DataAnnotations;
using Chloe.Annotations;
namespace WaterCloud.Domain.MaterialManage
{
/// <summary>
/// 创 建：超级管理员
/// 日 期：2020-12-15 15:12
/// 描 述：产出表实体类
/// </summary>
[TableAttribute("mes_BadMaterial")]
public class BadMaterialEntity : IEntity<BadMaterialEntity>
{
/// <summary>
/// id
/// </summary>
/// <returns></returns>
[Column("F_Id", IsPrimaryKey = true)]
[AutoIncrement]
public long F_Id { get; set; }
/// <summary>
/// 流转箱编号
/// </summary>
public string F_TransferBoxCode { get; set; }
/// <summary>
/// 料号Id
/// </summary>
public string F_MaterialId { get; set; }
/// <summary>
/// 料号描述
/// </summary>
public string F_MaterialCode { get; set; }
/// <summary>
/// 料号描述
/// </summary>
public string F_MaterialName { get; set; }
/// <summary>
/// 料号单位
/// </summary>
public string F_MaterialUnit { get; set; }
/// <summary>
/// 料号分类
/// </summary>
public int? F_MaterialType { get; set; }
/// <summary>
/// 料号批次
/// </summary>
public string F_MaterialBatch { get; set; }
/// <summary>
///
/// </summary>
public bool? F_EnabledMark { get; set; }
/// <summary>
/// 备注
/// </summary>
public string F_Description { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? F_CreatorTime { get; set; }
/// <summary>
/// 创建人id
/// </summary>
public string F_CreatorUserId { get; set; }
public string F_CreatorUserName { get; set; }
/// <summary>
/// 数量
/// </summary>
/// <returns></returns>
public float? F_Num { get; set; }
public long F_CheckoutId { get; set; }
/// <summary>
/// 不良检验来源(0库存不良，1入库不良，2产出不良，3领用不良)
/// </summary>
public int? F_BadAppearType { get; set; }
[NotMapped]
public string F_StorageId { get; set; }
}
}

4
WaterCloud.Service/AutoJob/Job/CheckEqpStopJob.cs
View File

@ -194,7 +194,7 @@ GROUP BY d.f_id, d.F_EqpName)g on t.F_Id = g.f_id";
{
if (DateTime.Now.Hour == 8 || DateTime.Now.Hour == 20) return;
var eqp = _context.Query<EquipmentEntity>(t => t.F_EqpUse == 2 || t.F_EqpUse == 6 || t.F_EqpUse == 9);
var eqp = _context.Query<EquipmentEntity>(t => t.F_EqpType == 0 && t.F_ParentId == "0");
var workplan = _context.Query<WorkPlanEntity>(t => Sql.DiffDays(t.F_Date, date) == 0 && classnum == t.F_ClassNum);
var query = eqp.LeftJoin<WorkPlanEntity>(workplan, (a, b) => a.F_Id == b.F_EqpId).Select((a, b) => new stopResultEntity
@ -243,7 +243,7 @@ GROUP BY d.f_id, d.F_EqpName)g on t.F_Id = g.f_id";
/// <returns></returns>
public async Task setIsLoadingCompletedIntime(DateTime datebgn, DateTime dateend, string dateString, string shift)
{
var eqp = _context.Query<EquipmentEntity>(t => t.F_EqpUse == 2 || t.F_EqpUse == 6 || t.F_EqpUse == 9)
var eqp = _context.Query<EquipmentEntity>(t => t.F_EqpType == 0 && t.F_ParentId == "0")
.Select(t => new stopResultEntity
{
F_EqpName = t.F_EqpName,

4
WaterCloud.Service/MaterialManage/WorkRunService.cs
View File

@ -91,8 +91,8 @@ namespace WaterCloud.Service.MaterialManage
SortedDictionary<string, float> outProductDic = new SortedDictionary<string, float>();
DateTime startTime = new DateTime(DateTime.Now.Year, 1, 1); ;
var works = uniwork.IQueryable<WorkOrderDetailEntity>().Where(a => a.F_RealEndTime >= startTime && a.F_WorkOrderState > 1).ToList();
var hotList = uniwork.IQueryable<EquipmentEntity>().Where(a => a.F_ParentId == "0" && a.F_EqpUse == 9 && a.F_EnabledMark == true && a.F_DeleteMark == false).Select(a => a.F_Id).ToList();
var weldList = uniwork.IQueryable<EquipmentEntity>().Where(a => a.F_ParentId == "0" && a.F_EqpUse == 2 && a.F_EnabledMark == true && a.F_DeleteMark == false).Select(a => a.F_Id).ToList();
var hotList = uniwork.IQueryable<EquipmentEntity>().Where(a => a.F_ParentId == "0" && a.F_EqpUse == 10 && a.F_EnabledMark == true && a.F_DeleteMark == false).Select(a => a.F_Id).ToList();
var weldList = uniwork.IQueryable<EquipmentEntity>().Where(a => a.F_ParentId == "0" && a.F_EqpUse == 15 && a.F_EnabledMark == true && a.F_DeleteMark == false).Select(a => a.F_Id).ToList();
var laserList = uniwork.IQueryable<EquipmentEntity>().Where(a => a.F_ParentId == "0" && a.F_EqpUse == 6 && a.F_EnabledMark == true && a.F_DeleteMark == false).Select(a => a.F_Id).ToList();
for (int i = 1; i <= DateTime.Now.Month; i++)
{

12
WaterCloud.Service/PlanManage/OrderService.cs
View File

@ -430,10 +430,10 @@ namespace WaterCloud.Service.PlanManage
{
continue;
}
int tempnum = (int)item.F_NeedNum / (ordernote.F_DayNum ?? 0);
int palletnum = tempnum / 22;
var tempout = new OutStorageEntity();
var tempMaterial = warmMaterials.Where(a => a.F_Id == item.F_MaterialId).FirstOrDefault();
int tempnum = (int)item.F_NeedNum / (ordernote.F_DayNum ?? 0);
int palletnum = tempnum / (int)tempMaterial.F_ContainerNum;
var tempout = new OutStorageEntity();
tempout.Create();
tempout.F_DoneNum = 0;
tempout.F_EnabledMark = false;
@ -442,15 +442,15 @@ namespace WaterCloud.Service.PlanManage
tempout.F_EnabledMark = true;
}
tempout.F_MaterialId = item.F_MaterialId;
tempout.F_Num = palletnum * 22;
tempout.F_Num = palletnum * (int)tempMaterial.F_ContainerNum;
if (item.F_NeedNum - item.F_DoneNum < tempout.F_Num)
{
tempout.F_Num = item.F_NeedNum - item.F_DoneNum;
}
if (storage.F_Num < tempout.F_Num)
{
palletnum = (int)storage.F_Num / 22;
tempout.F_Num = palletnum * 22;
palletnum = (int)storage.F_Num / (int)tempMaterial.F_ContainerNum;
tempout.F_Num = palletnum * (int)tempMaterial.F_ContainerNum;
}
storage.F_Num -= tempout.F_Num;
item.F_DoneNum += tempout.F_Num;

13
WaterCloud.Service/ProcessManage/WorkOrderRunService.cs
View File

@ -267,13 +267,13 @@ namespace WaterCloud.Service.ProcessManage
var ids = eqpList.Select(a => a.F_Id).ToList();
var useList = userTimeList.ToList<EqpWorkTimeEntity>();
var temps = eqpList.Select(a => a.F_Id).ToList();
var mould = eqpList.Where(a => a.F_EqpUse == 7).FirstOrDefault();
var items = await itemsApp.GetItemList("Mes_MoveEqpSetting");
var moulditems = items.FirstOrDefault(a => a.F_ItemCode == "2").F_Description.Split(",");
var fixtureitems = items.FirstOrDefault(a => a.F_ItemCode == "1").F_Description.Split(",");
var mould = eqpList.Where(a => moulditems.Contains(a.F_EqpUse.ToString())).FirstOrDefault();
var fixture = eqpList.Where(a => fixtureitems.Contains(a.F_EqpUse.ToString())).FirstOrDefault();
var master = eqpList.Where(a => a.F_IsMaster == true).FirstOrDefault();
int mouldCount = 0;
if (master.F_EqpUse == 9 && eqpList.Where(a => a.F_EqpUse == 7).Count() == 0)
{
throw new Exception("热压设备必须带模具");
}
//检测设备有没有问题
if (eqpList.Count() != uniwork.IQueryable<EquipmentEntity>(a => ids.Contains(a.F_Id) && a.F_EqpState < 2).Count())
{
@ -294,7 +294,6 @@ namespace WaterCloud.Service.ProcessManage
mould = null;
}
}
var fixture = eqpList.Where(a => a.F_EqpUse == 18).FirstOrDefault();
int count = uniwork.IQueryable<WorkOrderDetailEqpBandingEntity>(a => temps.Contains(a.F_EqpId))
.InnerJoin<WorkOrderDetailEntity>((a, b) => a.F_WorkOrderDetailId == b.F_Id && b.F_WorkOrderState == 1)
.Select((a, b) => b).Count();
@ -353,7 +352,7 @@ namespace WaterCloud.Service.ProcessManage
entity.F_EqpUse = item.F_EqpUse;
entity.F_MouldNum = 0;
entity.F_IsMaster = item.F_IsMaster;
if (item.F_EqpUse == 7)
if (moulditems.Contains(item.F_EqpUse.ToString()))
{
var cout = uniwork.IQueryable<WorkOrderDetailEntity>(a => a.F_WorkOrderState == 1 && a.F_Id != keyValue).InnerJoin<WorkOrderDetailEqpBandingEntity>((a, b) => a.F_Id == b.F_WorkOrderDetailId && b.F_EqpUse == 7 && b.F_EqpId == item.F_Id)
.Select((a, b) => b.F_MouldNum).ToList().Sum() ?? 0;

19
WaterCloud.Service/ReportRecord/ReportRecordService.cs
View File

@ -1304,25 +1304,6 @@ namespace WaterCloud.Service.ReportRecord
await uniwork.Delete<OutStorageInfoEntity>(expression2);
uniwork.Commit();
}
public async Task RemoveBadRecord(string keepTime)
{
DateTime operateTime = DateTime.Now;
if (keepTime == "7") //保留近一周
{
operateTime = DateTime.Now.AddDays(-7);
}
else if (keepTime == "1") //保留近一个月
{
operateTime = DateTime.Now.AddMonths(-1);
}
else if (keepTime == "3") //保留近三个月
{
operateTime = DateTime.Now.AddMonths(-2);
}
var expression = ExtLinq.True<BadMaterialEntity>();
expression = expression.And(t => t.F_CreatorTime <= operateTime);
await uniwork.Delete<BadMaterialEntity>(expression);
}
public async Task RemoveEqpUseRecord(string keepTime)
{
DateTime operateTime = DateTime.Now;

6
WaterCloud.Web/Areas/EquipmentManage/Controllers/EqpPqcCheckItemController.cs
View File

@ -35,7 +35,7 @@ namespace WaterCloud.Web.Areas.EquipmentManage.Controllers
public async Task<ActionResult> GetTreeGridJson(string keyword)
{
var data = await _eqpservice.GetLookList();
data = data.Where(t => t.F_EqpUse == 2 || t.F_EqpUse == 6 || t.F_EqpUse == 9).ToList();
data = data.Where(t => t.F_EqpType == 0).ToList();
if (!string.IsNullOrEmpty(keyword))
{
data = data.TreeWhere(t => t.F_EqpName.Contains(keyword));
@ -58,7 +58,7 @@ namespace WaterCloud.Web.Areas.EquipmentManage.Controllers
public async Task<ActionResult> GetEqpListJson(string keyword)
{
var data = await _eqpservice.GetList(keyword);
data = data.Where(t => t.F_EqpUse == 2 || t.F_EqpUse == 6 || t.F_EqpUse == 9).OrderBy(t=>t.F_EqpName).ToList();
data = data.Where(t => t.F_EqpType == 0).OrderBy(t=>t.F_EqpName).ToList();
return Content(data.ToJson());
}
@ -67,7 +67,7 @@ namespace WaterCloud.Web.Areas.EquipmentManage.Controllers
public async Task<ActionResult> GetEqpListJsonxmSelect(string keyword)
{
var datanew = await _eqpservice.GetList(keyword);
var data = datanew.Where(t => t.F_EqpUse == 2 || t.F_EqpUse == 6 || t.F_EqpUse == 9).OrderBy(t => t.F_EqpName)
var data = datanew.Where(t => t.F_EqpType == 0).OrderBy(t => t.F_EqpName)
.Select(t=>new {
name=t.F_EqpName,
value=t.F_Id

4
WaterCloud.Web/Areas/EquipmentManage/Views/Equipment/Form.cshtml
View File

@ -17,7 +17,7 @@
$('#F_MaintainType').parent().parent().addClass('layui-hide');
$('#F_MaintainNum').parent().parent().addClass('layui-hide');
initControl();
EqpTypeChange("");
EqpTypeChange("0");
var eqpUse;
if (!!keyValue) {
common.ajax({
@ -42,7 +42,7 @@
$("#F_ParentId").bindSelect({
url: "/EquipmentManage/Equipment/GetListJson",
id: "F_Id",
text: "F_EqpName"
text: "F_EqpName",
});
$("#F_EqpType").bindSelect({
data: top.clients.dataItems['Mes_EqpType'],

40
WaterCloud.Web/Areas/EquipmentManage/Views/Equipment/Index.cshtml
View File

@ -197,14 +197,6 @@
}
var ids = [];
for (var i = 0; i < data.length; i++) {
if (data[i].F_EqpState != 0) {
common.modalMsg("设备使用中，无法操作", "warning");
return false;
}
if (data[i].F_EqpUse == 7) {
common.modalMsg("模具请从模具管理操作", "warning");
return false;
}
ids.push(data[i].F_Id);
}
common.deleteForm({
@ -221,10 +213,6 @@
common.modalMsg("未选中数据", "warning");
return false;
}
if (data[0].F_EqpUse == 7) {
common.modalMsg("模具请从模具管理操作", "warning");
return false;
}
common.modalOpen({
title: "编辑界面",
url: "/EquipmentManage/Equipment/Form?keyValue=" + data[0].F_Id,
@ -237,10 +225,6 @@
common.modalMsg("未选中数据", "warning");
return false;
}
if (data[0].F_EqpUse == 7) {
common.modalMsg("模具请从模具管理操作", "warning");
return false;
}
common.modalOpen({
title: "查看界面",
url: "/EquipmentManage/Equipment/Details?keyValue=" + data[0].F_Id,
@ -258,8 +242,8 @@
common.modalMsg("子设备无需绑定", "warning");
return false;
}
if (data[0].F_EqpUse == 7) {
common.modalMsg("模具无需绑定", "warning");
if (data[0].F_EqpType != 0) {
common.modalMsg("固定设备才能绑定", "warning");
return false;
}
common.modalOpen({
@ -314,8 +298,8 @@
common.modalMsg("子设备无需绑定", "warning");
return false;
}
if (data[0].F_EqpUse == 7) {
common.modalMsg("模具无需绑定", "warning");
if (data[0].F_EqpType != 0) {
common.modalMsg("固定设备才能绑定", "warning");
return false;
}
common.openNewTabByIframe({
@ -349,10 +333,6 @@
});
}
else if (obj.event === 'edit') {
if (obj.data.F_EqpUse == 7) {
common.modalMsg("模具请从模具管理操作", "warning");
return false;
}
common.modalOpen({
title: "编辑界面",
url: "/EquipmentManage/Equipment/Form?keyValue=" + obj.data.F_Id,
@ -361,10 +341,6 @@
});
}
else if (obj.event === 'details') {
if (obj.data.F_EqpUse == 7) {
common.modalMsg("模具请从模具管理操作", "warning");
return false;
}
common.modalOpen({
title: "查看界面",
url: "/EquipmentManage/Equipment/Details?keyValue=" + obj.data.F_Id,
@ -378,8 +354,8 @@
common.modalMsg("子设备无需绑定", "warning");
return false;
}
if (obj.data.F_EqpUse == 7) {
common.modalMsg("模具无需绑定", "warning");
if (data[0].F_EqpType != 0) {
common.modalMsg("固定设备才能绑定", "warning");
return false;
}
common.openNewTabByIframe({
@ -392,8 +368,8 @@
common.modalMsg("子设备无需绑定", "warning");
return false;
}
if (obj.data.F_EqpUse == 7) {
common.modalMsg("模具无需绑定", "warning");
if (data[0].F_EqpType != 0) {
common.modalMsg("固定设备才能绑定", "warning");
return false;
}
common.modalOpen({

6
WaterCloud.Web/Areas/RunMonitor/Views/SmartScreen/Index.cshtml
View File

@ -37,7 +37,7 @@
<div class="loadbox"><img src="/picture/loading.gif"> 页面加载中...</div>
</div>
<div class="head">
<h1 onclick="openSetting()">@ViewBag.BoardName-普热斯勒出品</h1>
<h1 onclick="openSetting()">@ViewBag.BoardName-水之云出品</h1>
<div class="weather"><span id="showTime"></span></div>
</div>
<div class="layuimini-site-mobile">
@ -93,7 +93,7 @@
<div class="layui-row">
<div class="layui-col-md4">
<div class="boxall">
<div class="alltitle">区域:热成型</div>
<div class="alltitle">区域:冲压</div>
<div class="allnav">
<div class="textbox">
<div class="half">
@ -149,7 +149,7 @@
</div>
<div class="layui-col-md4">
<div class="boxall">
<div class="alltitle">区域:激光切割</div>
<div class="alltitle">区域:切割</div>
<div class="allnav">
<div class="textbox">
<div class="half">

1
WaterCloud.Web/wwwroot/js/lay-config.js
View File

@ -52,4 +52,5 @@ layui.config({
numberInput: 'numberInput/numberInput',//数字输入框组件
labelGeneration: 'labelGeneration/labelGeneration',//动态标签组件
HandwrittenSignature: 'HandwrittenSignature/HandwrittenSignature',//签名组件
inputAttr: 'inputAttr/inputAttr',//输入框扩展
});

2
WaterCloud.WebApi/Controllers/EqpRepairController.cs
View File

@ -36,7 +36,7 @@ namespace WaterCloud.WebApi.Controllers
public async Task<AlwaysResult> getEqplist()
{
var data = await equipmentService.GetList();
data = data.Where(t => t.F_EqpUse == 2 || t.F_EqpUse == 6 || t.F_EqpUse == 9).OrderBy(t => t.F_EqpName).ToList();
data = data.Where(t => t.F_EqpType == 0 && t.F_ParentId == "0").OrderBy(t => t.F_EqpName).ToList();
return new AlwaysResult<List<EquipmentEntity>> { state = ResultType.success.ToString(), data = data };
}

4552
database/szprslmes(带数据).sql Normal file
View File

File diff suppressed because one or more lines are too long