|
|
|
@ -19,6 +19,7 @@ using Microsoft.Extensions.DependencyInjection;
|
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
using Microsoft.IdentityModel.Tokens;
|
|
|
|
using Microsoft.IdentityModel.Tokens;
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
|
|
|
|
using SixLabors.ImageSharp.Drawing;
|
|
|
|
using System;
|
|
|
|
using System;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Collections.ObjectModel;
|
|
|
|
using System.Collections.ObjectModel;
|
|
|
|
@ -481,7 +482,7 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
saleOrderId = t.Key.saleOrderId,
|
|
|
|
saleOrderId = t.Key.saleOrderId,
|
|
|
|
thisOutAmount = t.Sum(x => x.totalAmount) - t.Sum(x => x.frozenAmount)
|
|
|
|
thisOutAmount = t.Sum(x => x.totalAmount) - t.Sum(x => x.frozenAmount)
|
|
|
|
});
|
|
|
|
});
|
|
|
|
List<WmsRawReturn> endStationCodeOutRaw = wmsRawReturns.Where(t => t.endStationCode == baseEquip.endStationCode).ToList();
|
|
|
|
List<WmsRawReturn> endStationCodeOutRaw = wmsRawReturns.Where(t => baseEquip.endStationCode.Contains(t.endStationCode)).ToList();
|
|
|
|
List<long?> materialIds = endStationCodeOutRaw.Select(t => t.materialId).ToList();
|
|
|
|
List<long?> materialIds = endStationCodeOutRaw.Select(t => t.materialId).ToList();
|
|
|
|
List<MesBaseMaterialInfo> mesBaseMaterialInfos = dbContext.MesBaseMaterialInfo.Where(t => materialIds.Contains(t.MaterialId)).ToList();
|
|
|
|
List<MesBaseMaterialInfo> mesBaseMaterialInfos = dbContext.MesBaseMaterialInfo.Where(t => materialIds.Contains(t.MaterialId)).ToList();
|
|
|
|
var bill = endStationCodeOutRaw.GroupBy(t => new { t.materialId })
|
|
|
|
var bill = endStationCodeOutRaw.GroupBy(t => new { t.materialId })
|
|
|
|
@ -550,10 +551,10 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
{
|
|
|
|
{
|
|
|
|
this.OutEndStations.ItemsSource = null;
|
|
|
|
this.OutEndStations.ItemsSource = null;
|
|
|
|
this.OutEndStations.Items.Clear();
|
|
|
|
this.OutEndStations.Items.Clear();
|
|
|
|
this.OutEndStations.ItemsSource = list.Distinct().Select(t => new
|
|
|
|
this.OutEndStations.ItemsSource = list.Distinct().OrderBy(t => t).Select(t => new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
EndStationName = t,
|
|
|
|
EndStationName = t,
|
|
|
|
ForeColor = baseEquip.endStationCode == null ? Brushes.Black : baseEquip.endStationCode.Contains(t) ? Brushes.Green : Brushes.Black
|
|
|
|
ForeColor = baseEquip.endStationCode == null ? Brushes.Black : baseEquip.endStationCode.Contains(t) ? Brushes.Red : Brushes.Black
|
|
|
|
});
|
|
|
|
});
|
|
|
|
this.OutEndStations.Items.Refresh();
|
|
|
|
this.OutEndStations.Items.Refresh();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -1566,32 +1567,37 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (count > 0)
|
|
|
|
if (count > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
MessageBoxResult messageBoxResult1 = HandyControl.Controls.MessageBox.Show("是否需要背负式小车返回？", "提示信息", MessageBoxButton.YesNoCancel, MessageBoxImage.Information);
|
|
|
|
MessageBoxResult messageBoxResult1 = HandyControl.Controls.MessageBox.Show("本次出库任务是否捡料完成？", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information);
|
|
|
|
if (messageBoxResult1 == MessageBoxResult.Yes)
|
|
|
|
if (messageBoxResult1 == MessageBoxResult.Yes)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
BaseEquip baseEquip = dbContext.BaseEquip.Where(t => t.objid == 10).First();
|
|
|
|
|
|
|
|
List<string>? list = JsonConvert.DeserializeObject<List<string>>(baseEquip.endStationCode);
|
|
|
|
|
|
|
|
new SelectOutRawForm(_host, "", 3, list).ShowDialog();
|
|
|
|
|
|
|
|
if (string.IsNullOrEmpty(SelectOutRawForm.StationCode))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
//MessageBoxResult messageBoxResult1 = HandyControl.Controls.MessageBox.Show("是否需要背负式小车返回？", "提示信息", MessageBoxButton.YesNoCancel, MessageBoxImage.Information);
|
|
|
|
{
|
|
|
|
//if (messageBoxResult1 == MessageBoxResult.Yes)
|
|
|
|
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.equipNo == SelectOutRawForm.StationCode);
|
|
|
|
//{
|
|
|
|
WcsTask wcsTask = CoreMapper.Map<WcsTask>(wcsCmd);
|
|
|
|
// BaseEquip baseEquip = dbContext.BaseEquip.Where(t => t.objid == 10).First();
|
|
|
|
wcsTask.taskStatus = 0;
|
|
|
|
// List<string>? list = JsonConvert.DeserializeObject<List<string>>(baseEquip.endStationCode);
|
|
|
|
wcsTask.createTime = DateTime.Now;
|
|
|
|
// new SelectOutRawForm(_host, "", 3, list).ShowDialog();
|
|
|
|
wcsTask.useFlag = 1;
|
|
|
|
// if (string.IsNullOrEmpty(SelectOutRawForm.StationCode))
|
|
|
|
wcsTask.objid = Global.SnowId.NextId();
|
|
|
|
// {
|
|
|
|
wcsTask.endPointId = endEquip.objid;
|
|
|
|
// return;
|
|
|
|
wcsTask.endPointNo = endEquip.equipNo;
|
|
|
|
// }
|
|
|
|
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTask);
|
|
|
|
// else
|
|
|
|
dbContext.Add(wcsTaskLog);
|
|
|
|
// {
|
|
|
|
dbContext.Add(wcsTask);
|
|
|
|
// BaseEquip endEquip = dbContext.BaseEquip.First(t => t.equipNo == SelectOutRawForm.StationCode);
|
|
|
|
}
|
|
|
|
// WcsTask wcsTask = CoreMapper.Map<WcsTask>(wcsCmd);
|
|
|
|
}
|
|
|
|
// wcsTask.taskStatus = 0;
|
|
|
|
else
|
|
|
|
// wcsTask.createTime = DateTime.Now;
|
|
|
|
|
|
|
|
// wcsTask.useFlag = 1;
|
|
|
|
|
|
|
|
// wcsTask.objid = Global.SnowId.NextId();
|
|
|
|
|
|
|
|
// wcsTask.endPointId = endEquip.objid;
|
|
|
|
|
|
|
|
// wcsTask.endPointNo = endEquip.equipNo;
|
|
|
|
|
|
|
|
// WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTask);
|
|
|
|
|
|
|
|
// dbContext.Add(wcsTaskLog);
|
|
|
|
|
|
|
|
// dbContext.Add(wcsTask);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
//else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
|
|
|
|
BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
|
|
|
|
baseEquip.endStationCode = string.Empty;
|
|
|
|
baseEquip.endStationCode = string.Empty;
|
|
|
|
@ -1608,7 +1614,6 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
baseEquip.ud3 = null;
|
|
|
|
baseEquip.ud3 = null;
|
|
|
|
dbContext.Update(baseEquip);
|
|
|
|
dbContext.Update(baseEquip);
|
|
|
|
dbContext.SaveChanges();
|
|
|
|
dbContext.SaveChanges();
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (wcsCmd.taskStatus == 3)
|
|
|
|
if (wcsCmd.taskStatus == 3)
|
|
|
|
@ -2688,12 +2693,6 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
{
|
|
|
|
{
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var wmsRawStock = dbContext.WmsRawStock
|
|
|
|
var wmsRawStock = dbContext.WmsRawStock
|
|
|
|
.FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text);
|
|
|
|
.FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text);
|
|
|
|
if (wmsRawStock == null)
|
|
|
|
if (wmsRawStock == null)
|
|
|
|
@ -2707,79 +2706,91 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
scanOutMsg.Text = "出库数量不能大于库存数量!";
|
|
|
|
scanOutMsg.Text = "出库数量不能大于库存数量!";
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var wcsTask = dbContext.WcsTask.Where(t => t.containerNo == txtOutBox.Text).FirstOrDefault();
|
|
|
|
BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
|
|
|
|
if (wcsTask == null)
|
|
|
|
if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
|
|
|
|
{
|
|
|
|
|
|
|
|
scanOutMsg.Text = "出库失败，非CTU出库任务，无法出库!";
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtOutBarCode.Text);
|
|
|
|
var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtOutBarCode.Text);
|
|
|
|
if (mesBaseBarcodeInfo != null)
|
|
|
|
if (mesBaseBarcodeInfo != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
WmsRawOutstock? wmsRawOutstock = dbContext.WmsRawOutstock
|
|
|
|
var list = JsonConvert.DeserializeObject<List<string>>(baseEquip.endStationCode);
|
|
|
|
.Where(t => t.materialId == mesBaseBarcodeInfo.materialId && t.realOutstockAmount < t.outstockAmount && t.saleOrderId == (mesBaseBarcodeInfo.saleOrderId == null ? 0 : mesBaseBarcodeInfo.saleOrderId) && t.endStationCode == baseEquip.endStationCode).FirstOrDefault();
|
|
|
|
var wmsRawOutstocks = dbContext.WmsRawOutstock
|
|
|
|
if (wmsRawOutstock != null)
|
|
|
|
.Where(t => t.materialId == mesBaseBarcodeInfo.materialId && t.realOutstockAmount < t.outstockAmount && t.saleOrderId == (mesBaseBarcodeInfo.saleOrderId == null ? 0 : mesBaseBarcodeInfo.saleOrderId) && baseEquip.endStationCode.Contains(t.endStationCode))
|
|
|
|
|
|
|
|
.ToList();
|
|
|
|
|
|
|
|
if (wmsRawOutstocks.Count > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
wmsRawOutstock.realOutstockAmount += outScan;
|
|
|
|
int index = 0;
|
|
|
|
if (wmsRawOutstock.outstockAmount == wmsRawOutstock.realOutstockAmount)
|
|
|
|
var sort = list.Select(t => new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
wmsRawOutstock.executeStatus = "2";
|
|
|
|
stationCode = t,
|
|
|
|
}
|
|
|
|
index = index++
|
|
|
|
else if (wmsRawOutstock.realOutstockAmount > wmsRawOutstock.outstockAmount)
|
|
|
|
});
|
|
|
|
|
|
|
|
wmsRawOutstocks = wmsRawOutstocks.OrderBy(t => sort.FirstOrDefault(s => s.stationCode == t.endStationCode) != null ? sort.FirstOrDefault(s => s.stationCode == t.endStationCode).index : 99).ToList();
|
|
|
|
|
|
|
|
decimal? sum = wmsRawOutstocks.Sum(t => (t.outstockAmount - t.realOutstockAmount));
|
|
|
|
|
|
|
|
if (outScan > sum)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
scanOutMsg.Text = "出库数量不能大于申请单数量，当前出库数量为：" + (wmsRawOutstock.realOutstockAmount - outScan) + "，申请单数量为：" + wmsRawOutstock.outstockAmount + "!";
|
|
|
|
scanOutMsg.Text = "出库数量不能大于当前出库的订单的数量";
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
wmsRawStock.totalAmount -= outScan;
|
|
|
|
foreach (var item in wmsRawOutstocks)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
decimal outAmount = 0;
|
|
|
|
|
|
|
|
if (item.outstockAmount - item.realOutstockAmount > outScan)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
item.realOutstockAmount += outScan;
|
|
|
|
|
|
|
|
outAmount += outScan;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
outScan -= (item.outstockAmount - item.realOutstockAmount.Value);
|
|
|
|
|
|
|
|
outAmount = item.outstockAmount - item.realOutstockAmount.Value;
|
|
|
|
|
|
|
|
item.realOutstockAmount = item.outstockAmount;
|
|
|
|
|
|
|
|
item.executeStatus = "2";
|
|
|
|
|
|
|
|
item.endTime = DateTime.Now;
|
|
|
|
|
|
|
|
}
|
|
|
|
if (wmsRawStock.totalAmount <= 0)
|
|
|
|
if (wmsRawStock.totalAmount <= 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
dbContext.Remove(wmsRawStock);
|
|
|
|
dbContext.Remove(wmsRawStock);
|
|
|
|
dbContext.Update(wmsRawOutstock);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
dbContext.Update(wmsRawStock);
|
|
|
|
dbContext.Update(wmsRawStock);
|
|
|
|
dbContext.Update(wmsRawOutstock);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (mesBaseBarcodeInfo != null)
|
|
|
|
wmsRawStock.totalAmount -= outAmount;
|
|
|
|
|
|
|
|
if (wmsRawStock.totalAmount == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
dbContext.WmsRawStock.Remove(wmsRawStock);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
dbContext.WmsRawStock.Update(wmsRawStock);
|
|
|
|
|
|
|
|
}
|
|
|
|
WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
|
|
|
|
WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
rawOutstockDetailId = Global.SnowId.NextId(),
|
|
|
|
rawOutstockDetailId = Global.SnowId.NextId(),
|
|
|
|
rawOutstockId = wmsRawOutstock.rawOutstockId,
|
|
|
|
rawOutstockId = item.rawOutstockId,
|
|
|
|
materialId = mesBaseBarcodeInfo.materialId,
|
|
|
|
materialId = mesBaseBarcodeInfo.materialId,
|
|
|
|
createDate = DateTime.Now,
|
|
|
|
createDate = DateTime.Now,
|
|
|
|
createBy = "WCS",
|
|
|
|
createBy = "WCS",
|
|
|
|
taskCode = wcsTask.objid.ToString(),
|
|
|
|
|
|
|
|
executeStatus = "2",
|
|
|
|
executeStatus = "2",
|
|
|
|
locationCode = wcsTask.currPointNo,
|
|
|
|
locationCode = wmsRawStock.locationCode,
|
|
|
|
outstockAmount = outScan,
|
|
|
|
outstockAmount = outScan,
|
|
|
|
planAmount = outScan,
|
|
|
|
planAmount = item.outstockAmount,
|
|
|
|
warehouseId = 512,
|
|
|
|
warehouseId = 512,
|
|
|
|
materialBarcode = mesBaseBarcodeInfo.barcodeInfo,
|
|
|
|
materialBarcode = mesBaseBarcodeInfo.barcodeInfo,
|
|
|
|
instockBatch = mesBaseBarcodeInfo.batchCode,
|
|
|
|
instockBatch = mesBaseBarcodeInfo.batchCode,
|
|
|
|
stackAmount = outScan,
|
|
|
|
stackAmount = mesBaseBarcodeInfo.batchFlag == "1" ? mesBaseBarcodeInfo.amount : 1,
|
|
|
|
outstockPerson = "WCS",
|
|
|
|
outstockPerson = "WCS",
|
|
|
|
outstockTime = DateTime.Now,
|
|
|
|
outstockTime = DateTime.Now,
|
|
|
|
outstockWay = "2",
|
|
|
|
outstockWay = "2",
|
|
|
|
materialProductionDate = mesBaseBarcodeInfo.productionDate
|
|
|
|
materialProductionDate = mesBaseBarcodeInfo.productionDate
|
|
|
|
};
|
|
|
|
};
|
|
|
|
dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
|
|
|
|
dbContext.Add(wmsProductOutstockDetail);
|
|
|
|
}
|
|
|
|
dbContext.Update(item);
|
|
|
|
dbContext.SaveChanges();
|
|
|
|
dbContext.SaveChanges();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// 没有申请单
|
|
|
|
|
|
|
|
// 如果选中了出库单，并且无需要出库的申请单，则禁止出库
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//if (!string.IsNullOrEmpty(baseEquip.endStationCode))
|
|
|
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "申请单里该条码无需出库！";
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
if (wmsRawStock.safeFlag != "1")
|
|
|
|
if (wmsRawStock.safeFlag != "1")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
scanOutMsg.Text = "该条码不是安全库存，且无申请单，禁止出库！";
|
|
|
|
scanOutMsg.Text = "该条码不是安全库存，且无申请单，禁止出库！";
|
|
|
|
@ -2803,11 +2814,11 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
WmsRawOutstock newWmsRawOutstock = new WmsRawOutstock();
|
|
|
|
WmsRawOutstock newWmsRawOutstock = new WmsRawOutstock();
|
|
|
|
newWmsRawOutstock.taskCode = timeStamp + "CTU" + Random.Shared.Next(10, 99);
|
|
|
|
newWmsRawOutstock.taskCode = timeStamp + "CTU" + Random.Shared.Next(10, 99);
|
|
|
|
newWmsRawOutstock.warehouseId = 512;
|
|
|
|
newWmsRawOutstock.warehouseId = 512;
|
|
|
|
newWmsRawOutstock.locationCode = wcsTask.currPointNo;
|
|
|
|
newWmsRawOutstock.locationCode = wmsRawStock.locationCode;
|
|
|
|
newWmsRawOutstock.stationId = 512;
|
|
|
|
newWmsRawOutstock.stationId = 512;
|
|
|
|
newWmsRawOutstock.materialId = mesBaseBarcodeInfo.materialId;
|
|
|
|
newWmsRawOutstock.materialId = mesBaseBarcodeInfo.materialId;
|
|
|
|
newWmsRawOutstock.materialBatch = mesBaseBarcodeInfo.barcodeInfo;
|
|
|
|
newWmsRawOutstock.materialBatch = mesBaseBarcodeInfo.barcodeInfo;
|
|
|
|
newWmsRawOutstock.palletInfoCode = wcsTask.containerNo;
|
|
|
|
newWmsRawOutstock.palletInfoCode = wmsRawStock.palletInfoCode;
|
|
|
|
newWmsRawOutstock.outstockAmount = outScan;
|
|
|
|
newWmsRawOutstock.outstockAmount = outScan;
|
|
|
|
newWmsRawOutstock.realOutstockAmount = outScan;
|
|
|
|
newWmsRawOutstock.realOutstockAmount = outScan;
|
|
|
|
newWmsRawOutstock.operationType = "1";
|
|
|
|
newWmsRawOutstock.operationType = "1";
|
|
|
|
@ -2863,29 +2874,215 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
scanOutMsg.Text = "出库成功!";
|
|
|
|
|
|
|
|
txtOutScan.Text = string.Empty;
|
|
|
|
|
|
|
|
txtOutBarCode.Text = string.Empty;
|
|
|
|
|
|
|
|
outMaterialSpecTxt.Text = string.Empty;
|
|
|
|
|
|
|
|
outMaterialNameTxt.Text = string.Empty;
|
|
|
|
|
|
|
|
txtOutBox.Text = string.Empty;
|
|
|
|
|
|
|
|
txtOutBox.Focus();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
scanOutMsg.Text = "未查询到该条码信息!";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
scanOutMsg.Text = "请先扫描容器号和条码!";
|
|
|
|
scanOutMsg.Text = "请先扫描容器号和条码!";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#region 原逻辑
|
|
|
|
|
|
|
|
//if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
|
|
|
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// var wmsRawStock = dbContext.WmsRawStock
|
|
|
|
|
|
|
|
// .FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text);
|
|
|
|
|
|
|
|
// if (wmsRawStock == null)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "库存已经被清空!";
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// decimal outScan = Convert.ToDecimal(this.txtOutScan.Text);
|
|
|
|
|
|
|
|
// if (outScan > wmsRawStock.totalAmount - wmsRawStock.frozenAmount)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "出库数量不能大于库存数量!";
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// var wcsTask = dbContext.WcsTask.Where(t => t.containerNo == txtOutBox.Text).FirstOrDefault();
|
|
|
|
|
|
|
|
// if (wcsTask == null)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "出库失败，非CTU出库任务，无法出库!";
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtOutBarCode.Text);
|
|
|
|
|
|
|
|
// if (mesBaseBarcodeInfo != null)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// var list = JsonConvert.DeserializeObject<List<string>>(baseEquip.endStationCode);
|
|
|
|
|
|
|
|
// var wmsRawOutstocks = dbContext.WmsRawOutstock
|
|
|
|
|
|
|
|
// .Where(t => t.materialId == mesBaseBarcodeInfo.materialId && t.realOutstockAmount < t.outstockAmount && t.saleOrderId == (mesBaseBarcodeInfo.saleOrderId == null ? 0 : mesBaseBarcodeInfo.saleOrderId) && baseEquip.endStationCode.Contains(t.endStationCode))
|
|
|
|
|
|
|
|
// .ToList();
|
|
|
|
|
|
|
|
// WmsRawOutstock wmsRawOutstock = null;
|
|
|
|
|
|
|
|
// foreach (var item in list)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// wmsRawOutstock ??= wmsRawOutstocks.Where(t => t.endStationCode == item).FirstOrDefault();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (wmsRawOutstock != null)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// wmsRawOutstock.realOutstockAmount += outScan;
|
|
|
|
|
|
|
|
// if (wmsRawOutstock.outstockAmount == wmsRawOutstock.realOutstockAmount)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// wmsRawOutstock.executeStatus = "2";
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else if (wmsRawOutstock.realOutstockAmount > wmsRawOutstock.outstockAmount)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "出库数量不能大于申请单数量，当前出库数量为：" + (wmsRawOutstock.realOutstockAmount - outScan) + "，申请单数量为：" + wmsRawOutstock.outstockAmount + "!";
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// wmsRawStock.totalAmount -= outScan;
|
|
|
|
|
|
|
|
// if (wmsRawStock.totalAmount <= 0)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// dbContext.Remove(wmsRawStock);
|
|
|
|
|
|
|
|
// dbContext.Update(wmsRawOutstock);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// dbContext.Update(wmsRawStock);
|
|
|
|
|
|
|
|
// dbContext.Update(wmsRawOutstock);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (mesBaseBarcodeInfo != null)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// rawOutstockDetailId = Global.SnowId.NextId(),
|
|
|
|
|
|
|
|
// rawOutstockId = wmsRawOutstock.rawOutstockId,
|
|
|
|
|
|
|
|
// materialId = mesBaseBarcodeInfo.materialId,
|
|
|
|
|
|
|
|
// createDate = DateTime.Now,
|
|
|
|
|
|
|
|
// createBy = "WCS",
|
|
|
|
|
|
|
|
// taskCode = wcsTask.objid.ToString(),
|
|
|
|
|
|
|
|
// executeStatus = "2",
|
|
|
|
|
|
|
|
// locationCode = wcsTask.currPointNo,
|
|
|
|
|
|
|
|
// outstockAmount = outScan,
|
|
|
|
|
|
|
|
// planAmount = outScan,
|
|
|
|
|
|
|
|
// warehouseId = 512,
|
|
|
|
|
|
|
|
// materialBarcode = mesBaseBarcodeInfo.barcodeInfo,
|
|
|
|
|
|
|
|
// instockBatch = mesBaseBarcodeInfo.batchCode,
|
|
|
|
|
|
|
|
// stackAmount = outScan,
|
|
|
|
|
|
|
|
// outstockPerson = "WCS",
|
|
|
|
|
|
|
|
// outstockTime = DateTime.Now,
|
|
|
|
|
|
|
|
// outstockWay = "2",
|
|
|
|
|
|
|
|
// materialProductionDate = mesBaseBarcodeInfo.productionDate
|
|
|
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
// dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// dbContext.SaveChanges();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// // 没有申请单
|
|
|
|
|
|
|
|
// // 如果选中了出库单，并且无需要出库的申请单，则禁止出库
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //if (!string.IsNullOrEmpty(baseEquip.endStationCode))
|
|
|
|
|
|
|
|
// //{
|
|
|
|
|
|
|
|
// // scanOutMsg.Text = "申请单里该条码无需出库！";
|
|
|
|
|
|
|
|
// // return;
|
|
|
|
|
|
|
|
// //}
|
|
|
|
|
|
|
|
// if (wmsRawStock.safeFlag != "1")
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "该条码不是安全库存，且无申请单，禁止出库！";
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (mesBaseBarcodeInfo.PurchaseOrderId == null)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// wmsRawStock.totalAmount -= outScan;
|
|
|
|
|
|
|
|
// if (wmsRawStock.totalAmount == 0)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// dbContext.WmsRawStock.Remove(wmsRawStock);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// dbContext.WmsRawStock.Update(wmsRawStock);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// #region 插入rawOutstock
|
|
|
|
|
|
|
|
// string timeStamp = DateTime.Now.ToString("yyyyMMddHHmmss");
|
|
|
|
|
|
|
|
// WmsRawOutstock newWmsRawOutstock = new WmsRawOutstock();
|
|
|
|
|
|
|
|
// newWmsRawOutstock.taskCode = timeStamp + "CTU" + Random.Shared.Next(10, 99);
|
|
|
|
|
|
|
|
// newWmsRawOutstock.warehouseId = 512;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.locationCode = wcsTask.currPointNo;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.stationId = 512;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.materialId = mesBaseBarcodeInfo.materialId;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.materialBatch = mesBaseBarcodeInfo.barcodeInfo;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.palletInfoCode = wcsTask.containerNo;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.outstockAmount = outScan;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.realOutstockAmount = outScan;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.operationType = "1";
|
|
|
|
|
|
|
|
// newWmsRawOutstock.taskType = "1";
|
|
|
|
|
|
|
|
// newWmsRawOutstock.auditStatus = "1";
|
|
|
|
|
|
|
|
// newWmsRawOutstock.applyBy = "CtuGun";
|
|
|
|
|
|
|
|
// newWmsRawOutstock.applyDate = DateTime.Now;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.executeStatus = "2";
|
|
|
|
|
|
|
|
// newWmsRawOutstock.saleOrderId = mesBaseBarcodeInfo.saleOrderId;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.updateDate = DateTime.Now;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.beginTime = DateTime.Now;
|
|
|
|
|
|
|
|
// newWmsRawOutstock.endTime = DateTime.Now;
|
|
|
|
|
|
|
|
// dbContext.WmsRawOutstock.Add(newWmsRawOutstock);
|
|
|
|
|
|
|
|
// dbContext.SaveChanges();
|
|
|
|
|
|
|
|
// #endregion
|
|
|
|
|
|
|
|
// //if (mesBaseBarcodeInfo != null)
|
|
|
|
|
|
|
|
// //{
|
|
|
|
|
|
|
|
// // WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
|
|
|
|
|
|
|
|
// // {
|
|
|
|
|
|
|
|
// // rawOutstockDetailId = Global.SnowId.NextId(),
|
|
|
|
|
|
|
|
// // rawOutstockId = 0,
|
|
|
|
|
|
|
|
// // materialId = mesBaseBarcodeInfo.materialId,
|
|
|
|
|
|
|
|
// // createDate = DateTime.Now,
|
|
|
|
|
|
|
|
// // createBy = "WCS",
|
|
|
|
|
|
|
|
// // taskCode = wcsTask.objid.ToString(),
|
|
|
|
|
|
|
|
// // executeStatus = "2",
|
|
|
|
|
|
|
|
// // locationCode = wcsTask.currPointNo,
|
|
|
|
|
|
|
|
// // outstockAmount = outScan,
|
|
|
|
|
|
|
|
// // planAmount = outScan,
|
|
|
|
|
|
|
|
// // warehouseId = 512,
|
|
|
|
|
|
|
|
// // materialBarcode = mesBaseBarcodeInfo.barcodeInfo,
|
|
|
|
|
|
|
|
// // instockBatch = mesBaseBarcodeInfo.batchCode,
|
|
|
|
|
|
|
|
// // stackAmount = outScan,
|
|
|
|
|
|
|
|
// // outstockPerson = "WCS",
|
|
|
|
|
|
|
|
// // outstockTime = DateTime.Now,
|
|
|
|
|
|
|
|
// // outstockWay = "2",
|
|
|
|
|
|
|
|
// // materialProductionDate = mesBaseBarcodeInfo.productionDate
|
|
|
|
|
|
|
|
// // };
|
|
|
|
|
|
|
|
// // dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
|
|
|
|
|
|
|
|
// //}
|
|
|
|
|
|
|
|
// // dbContext.SaveChanges();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "该条码的销售订单不正确";
|
|
|
|
|
|
|
|
// txtOutScan.Text = string.Empty;
|
|
|
|
|
|
|
|
// txtOutBarCode.Text = string.Empty;
|
|
|
|
|
|
|
|
// outMaterialSpecTxt.Text = string.Empty;
|
|
|
|
|
|
|
|
// outMaterialNameTxt.Text = string.Empty;
|
|
|
|
|
|
|
|
// txtOutBox.Text = string.Empty;
|
|
|
|
|
|
|
|
// txtOutBox.Focus();
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "出库成功!";
|
|
|
|
|
|
|
|
// txtOutScan.Text = string.Empty;
|
|
|
|
|
|
|
|
// txtOutBarCode.Text = string.Empty;
|
|
|
|
|
|
|
|
// outMaterialSpecTxt.Text = string.Empty;
|
|
|
|
|
|
|
|
// outMaterialNameTxt.Text = string.Empty;
|
|
|
|
|
|
|
|
// txtOutBox.Text = string.Empty;
|
|
|
|
|
|
|
|
// txtOutBox.Focus();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "未查询到该条码信息!";
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
//else
|
|
|
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
// scanOutMsg.Text = "请先扫描容器号和条码!";
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
catch (Exception ex)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
MessageBox.Show(ex.Message);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
@ -5257,6 +5454,72 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
{
|
|
|
|
{
|
|
|
|
DrawLocaitons();
|
|
|
|
DrawLocaitons();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void Window_Closing(object sender, CancelEventArgs e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
System.Diagnostics.Process p = new System.Diagnostics.Process();
|
|
|
|
|
|
|
|
p.StartInfo.FileName = "cmd.exe";
|
|
|
|
|
|
|
|
p.StartInfo.UseShellExecute = false; //是否使用操作系统shell启动
|
|
|
|
|
|
|
|
p.StartInfo.RedirectStandardInput = true;//接受来自调用程序的输入信息
|
|
|
|
|
|
|
|
p.StartInfo.RedirectStandardOutput = true;//由调用程序获取输出信息
|
|
|
|
|
|
|
|
p.StartInfo.RedirectStandardError = true;//重定向标准错误输出
|
|
|
|
|
|
|
|
p.StartInfo.CreateNoWindow = true;//不显示程序窗口
|
|
|
|
|
|
|
|
p.Start();//启动程序
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//向cmd窗口发送输入信息
|
|
|
|
|
|
|
|
p.StandardInput.WriteLine("taskkill /f /im Khd.Core.Wpf.exe" + "&exit");
|
|
|
|
|
|
|
|
p.StandardInput.WriteLine("taskkill /f /im Khd.Core.Wpf" + "&exit");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void createBearConfirmBox_Click(object sender, RoutedEventArgs e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
|
|
|
|
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
|
|
|
|
SelectOutRawForm selectOutRawForm = new SelectOutRawForm(this._host, "", 4);
|
|
|
|
|
|
|
|
selectOutRawForm.ShowDialog();
|
|
|
|
|
|
|
|
if (string.IsNullOrEmpty(SelectOutRawForm.StationCode))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
bool hasTask = dbContext.WcsTask.Where(t => t.nextPointId == 10).Any();
|
|
|
|
|
|
|
|
bool hasTaskManual = dbContext.WcsTaskManual.Where(t => t.nextPointId == 10).Any();
|
|
|
|
|
|
|
|
if (hasTask || hasTaskManual)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
MessageBox.Show("已经有任务了");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
BaseEquip startStationEquip = dbContext.BaseEquip.First(t => t.objid == 21);
|
|
|
|
|
|
|
|
BaseEquip bearAgvEquip = dbContext.BaseEquip.First(t => t.objid == 10);
|
|
|
|
|
|
|
|
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.equipNo == SelectOutRawForm.StationCode);
|
|
|
|
|
|
|
|
WcsTask bearAgvTask = new()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
objid = _jcSnowId.NextId(),
|
|
|
|
|
|
|
|
taskType = 32,
|
|
|
|
|
|
|
|
containerNo = null,
|
|
|
|
|
|
|
|
currPointId = startStationEquip.objid,
|
|
|
|
|
|
|
|
currPointNo = startStationEquip.equipNo,
|
|
|
|
|
|
|
|
nextPointId = bearAgvEquip.objid,
|
|
|
|
|
|
|
|
nextPointNo = bearAgvEquip.equipNo,
|
|
|
|
|
|
|
|
endPointId = endEquip.objid,
|
|
|
|
|
|
|
|
endPointNo = endEquip.equipNo,
|
|
|
|
|
|
|
|
taskStatus = 0,
|
|
|
|
|
|
|
|
createTime = DateTime.Now,
|
|
|
|
|
|
|
|
createBy = "WCS",
|
|
|
|
|
|
|
|
qty = 1,
|
|
|
|
|
|
|
|
useFlag = 1,
|
|
|
|
|
|
|
|
equipmentNo = startStationEquip.equipNo,
|
|
|
|
|
|
|
|
remark = "组装出库",
|
|
|
|
|
|
|
|
floorNo = 5,
|
|
|
|
|
|
|
|
fromFloorNo = 5,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
dbContext.Add(bearAgvTask);
|
|
|
|
|
|
|
|
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(bearAgvTask);
|
|
|
|
|
|
|
|
dbContext.Add(wcsTaskLog);
|
|
|
|
|
|
|
|
dbContext.SaveChanges();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
范
1 year ago