liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-新发泡完成mes计划

Browse Source
dev
liuwf 1 year ago
parent 81e0849186
commit 22ddeb365d
3 changed files with 59 additions and 79 deletions
Show Stats Download Patch File Download Diff File

21
Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs
Unescape Escape View File

@ -43,6 +43,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{
try
{
Id.Clear();
MaterialCode.Clear();
MaterialName.Clear();
PlanAmount.Clear();
@ -119,20 +120,14 @@ namespace Aucma.Core.BoxFoam.ViewModels
[RelayCommand]
public async void ClearPlan(string objId)
{
int id=int.Parse(objId);
var obj=await _boxFoamPlanServices.FirstAsync(d=>d.ObjId== id);
obj.MaterialCode = "";
obj.MaterialName = "";
obj.PlanAmount = 0;
var result= await _boxFoamPlanServices.UpdateAsync(obj);
if (result)
MessageBoxResult msg = MessageBox.Show("确定要删除吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
if (MessageBoxResult.Yes == msg)
{
ClearData();
MessageBox.Show("清除计划成功！", "系统提醒");
}
else
{
MessageBox.Show("清除计划失败！", "系统提醒");
int id = Id.ElementAt(int.Parse(objId)-1);
_boxFoamPlanServices.DeleteByIdAsync(id).Wait();
InitData();
MessageBox.Show("执行计划删除成功", "系统信息");
}
}

64
Aucma.Core.BoxFoam/ViewModels/QuantityIssuedViewModel.cs
Unescape Escape View File

@ -102,64 +102,36 @@ namespace Aucma.Core.BoxFoam.ViewModels
var productPlanInfo = _planInfo;
if (_planInfo != null)
{
var task = _boxFoamPlanServices.FirstAsync(d => d.ObjId ==int.Parse(_objId)).Result;
if (task != null)
BoxFoamPlan plan = new BoxFoamPlan();
plan.MaterialCode = _planInfo.MaterialCode;
plan.MaterialName = _planInfo.MaterialName;
plan.PlanAmount = Convert.ToInt32(TransmitAmount);
plan.ProductLineCode = "CX_02";
plan.StationCode = "1005";
plan.UpdateTime = DateTime.Now;
plan.CreateTime = DateTime.Now;
plan.OrderCode = _planInfo.OrderCode;
plan.PlanCode = _planInfo.PlanCode;
plan.ShiftType = 1;
var result = _boxFoamPlanServices.AddAsync(plan).Result;
if (result >= 0)
{
task.MaterialCode = _planInfo.MaterialCode;
task.MaterialName = _planInfo.MaterialName;
task.OrderCode = _planInfo.OrderCode;
task.PlanAmount = Convert.ToInt32(TransmitAmount);
task.ProductLineCode = "CX_02";
task.StationCode = "1005";
task.UpdateTime = DateTime.Now;
task.ShiftType = 1;
var result = _boxFoamPlanServices.UpdateAsync(task).Result;
if (result)
{
MessageBox.Show("任务修改成功！", "系统提醒");
WeakReferenceMessenger.Default.Send<string>("RefreshTask");//刷新任务界面
}
else
{
MessageBox.Show("任务修改失败！", "系统提醒");
}
MessageBox.Show("任务添加成功！", "系统提醒");
WeakReferenceMessenger.Default.Send<string>("RefreshTask");//刷新任务界面
}
else
{
task = new BoxFoamPlan();
task.MaterialCode = _planInfo.MaterialCode;
task.MaterialName = _planInfo.MaterialName;
task.OrderCode = _planInfo.OrderCode;
task.PlanAmount = Convert.ToInt32(TransmitAmount);
task.ProductLineCode = "CX_02";
task.StationCode = "1005";
task.CreateTime = DateTime.Now;
task.ShiftType = 1;
int plan = await _boxFoamPlanServices.AddAsync(task);
if (plan > 0 )
{
MessageBox.Show("任务添加成功！", "系统提醒");
WeakReferenceMessenger.Default.Send<string>("RefreshTask");//刷新任务界面
}
else
{
MessageBox.Show("任务添加失败！", "系统提醒");
}
MessageBox.Show("任务添加失败！", "系统提醒");
}
}
else
{
BoxFoamPlan plan = new BoxFoamPlan();
plan.MaterialCode = _planInfo.MaterialCode;
plan.MaterialName = _planInfo.MaterialName;
plan.OrderCode = _planInfo.OrderCode;
plan.PlanAmount = Convert.ToInt32(TransmitAmount);
plan.ProductLineCode = "CX_02";
plan.StationCode = "1005";
plan.CreateTime = DateTime.Now;
plan.ShiftType = 1;
var result = _boxFoamPlanServices.AddAsync(plan).Result;
var result = _boxFoamPlanServices.AddAsync(plan).Result;
if (result > 0)
{
MessageBox.Show("任务添加成功！", "系统提醒");

53
Aucma.Core.ProductOffLine/Business/offLineBusiness.cs
Unescape Escape View File

@ -184,24 +184,29 @@ namespace Aucma.Core.ProductOffLine.Business
OffLineInfo info11 = MapperTwo(TempOffLineInfo);
// 添加成品下线表
CodeBindingRecord bindingRecord1 = _codeBindingServices.FirstAsync(x=>x.ProductCode == info11.ProductCode).Result;
if (bindingRecord1 == null) return false;
if (bindingRecord1 == null)
{
log.Info("mes数据库未查询到条码绑定记录");
return false;
}
info11.BoxCode = bindingRecord1.BoxCode;
// 产线
info11.ProductLineCode = "CX_01";
info11.ProductLineCode = "CX_02";
_offLineInfoServices.AddAsync(info11);
// 修改订单表
////6.更新mes 数据库完成数量和时间(BASE_ORDERINFO) 注意:查询的字段可能需要修改，确保数据一致
////6.1截取订单号去查询更新BASE_ORDERINFO,全放到service处理
BaseOrderInfo order = _baseOrderInfoServices.FirstAsync(x => x.OrderCode == TempOffLineInfo.ProductOrderNo).Result;
// order.CompleteAmount++;
//if (order.CompleteAmount == order.OrderAmount)
//{
// order.CompleteDate = DateTime.Now;
//}
//order.UpdatedTime = DateTime.Now;
//await _baseOrderInfoServices.UpdateAsync(order);
order.CompleteAmount++;
if (order.CompleteAmount == order.OrderAmount)
{
order.CompleteDate = DateTime.Now;
}
order.UpdatedTime = DateTime.Now;
_baseOrderInfoServices.UpdateAsync(order);
#region 暂时不启用，因为还没打箱体码，查不到数据，更新过点数据
//PrintBarCode print = await _printBarCodeServices.FirstAsync(x => x.MaterialBarcode == bindingRecord1.BoxCode);
@ -319,20 +324,18 @@ namespace Aucma.Core.ProductOffLine.Business
//2.上传条码系统
if (!string.IsNullOrEmpty(TempOffLineInfo.ProductOrderNo))
{
// mes查询订单数据, 异常处理：后期可能根据SN码查箱体码，查订单号并检查更新订单数据
BaseOrderInfo order = _baseOrderInfoServices.FirstAsync(x => x.OrderCode == TempOffLineInfo.ProductOrderNo.Replace("0000", "")).Result;
// 条码系统保存接口
string strSave = _productOffLineServices.SaveBarcodeInfo(BarCode.Trim(), "ILS_SORT", TempOffLineInfo.ProductOrderNo, 1);
// string strSave = "Y";
if (!string.IsNullOrEmpty(strSave))
{
if (strSave == "Y")
{
log.Info(BarCode + "上传条码成功:" + strSave);
TempOffLineInfo.MsgInfo = TempOffLineInfo.MsgInfo + ",上传条码成功";
//界面刷新
TempOffLineInfo.ProductRefreshFlag = true;
// mes查询订单数据, 异常处理：后期可能根据SN码查箱体码，查订单号并检查更新订单数据
BaseOrderInfo order = _baseOrderInfoServices.FirstAsync(x => x.OrderCode == TempOffLineInfo.ProductOrderNo.Replace("0000", "")).Result;
if (order != null)
{
TempOffLineInfo.OrderQty = order.OrderAmount; // 订单数量*5
@ -340,16 +343,24 @@ namespace Aucma.Core.ProductOffLine.Business
}
else
{
TempOffLineInfo.MsgInfo = TempOffLineInfo.MsgInfo + ",MES查询订单数据异常";
TempOffLineInfo.MsgAlarmFlag = true;
//界面刷新
TempOffLineInfo.ProductRefreshFlag = true;
return false;
}
//界面刷新
TempOffLineInfo.ProductRefreshFlag = true;
return true;
}
else
{
log.Info(BarCode + "上传条码失败:" + strSave);
TempOffLineInfo.MsgInfo = TempOffLineInfo.MsgInfo + ",上传条码失败" + strSave;
//界面刷新
TempOffLineInfo.ProductRefreshFlag = true;
if (strSave.Contains("条码重复"))
{
// 查询本地数据库是否有数据
@ -375,7 +386,9 @@ namespace Aucma.Core.ProductOffLine.Business
return true;
}
}
TempOffLineInfo.MsgAlarmFlag = false;
TempOffLineInfo.MsgAlarmFlag = true;
//界面刷新
TempOffLineInfo.ProductRefreshFlag = true;
return false;
}

Write Preview
Loading…
Cancel
Save