baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add-CTU无申请单出库添加wms_raw_outStock记录

Browse Source
master
liuwf 1 year ago
parent 9d75dde1a2
commit 9ed019e039
2 changed files with 111 additions and 20 deletions
Show Stats Download Patch File Download Diff File

1
src/Khd.Core.Domain/Models/WmsRawOutstock.cs
Unescape Escape View File

@ -21,6 +21,7 @@ namespace Khd.Core.Domain.Models
public long? saleOrderId { get; set; } public long? saleOrderId { get; set; }
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column("raw_outstock_id")] [Column("raw_outstock_id")]
public long? rawOutstockId { get; set; } public long? rawOutstockId { get; set; }

94
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
Unescape Escape View File

@ -119,6 +119,8 @@ namespace Khd.Core.Wpf.Form
/// <param name="e"></param> /// <param name="e"></param>
private void FormBoard_Loaded(object sender, RoutedEventArgs e) private void FormBoard_Loaded(object sender, RoutedEventArgs e)
{ {
try try
{ {
itemsControlItems = new ObservableCollection<SelectItemModel>(); itemsControlItems = new ObservableCollection<SelectItemModel>();
@ -1807,6 +1809,25 @@ namespace Khd.Core.Wpf.Form
WmsRawStock wmsRawStock = wmsRawStocks.First(); WmsRawStock wmsRawStock = wmsRawStocks.First();
wmsRawStock.totalAmount += amount; wmsRawStock.totalAmount += amount;
dbContext.WmsRawStock.Update(wmsRawStock); dbContext.WmsRawStock.Update(wmsRawStock);
var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text);
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
beginTime = System.DateTime.Now,
endTime = DateTime.Now,
locationCode = container.locationCode,
executeStatus = "2",
instockAmount = amount,
instockType = "1",
materialBatchCode = txtInBarCode.Text,
materialId = material.materialId,
operationType = "2",
palletInfoCode = container.containerCode,
poNo = mesBaseBarcodeInfo.poNo,
warehouseId = 512
};
dbContext.WmsRawInstock.Add(wmsRawInstock);
dbContext.SaveChanges(); dbContext.SaveChanges();
totalMessage = wmsRawStock.totalAmount; totalMessage = wmsRawStock.totalAmount;
} }
@ -1836,6 +1857,24 @@ namespace Khd.Core.Wpf.Form
safeFlag = material.safeFlag safeFlag = material.safeFlag
}; };
dbContext.WmsRawStock.Add(newRawStock); dbContext.WmsRawStock.Add(newRawStock);
var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text);
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
beginTime = System.DateTime.Now,
endTime = DateTime.Now,
locationCode = container.locationCode,
executeStatus = "2",
instockAmount = amount,
instockType = "1",
materialBatchCode = txtInBarCode.Text,
materialId = material.materialId,
operationType = "2",
palletInfoCode = container.containerCode,
poNo = mesBaseBarcodeInfo.poNo,
warehouseId = 512
};
dbContext.WmsRawInstock.Add(wmsRawInstock);
dbContext.SaveChanges(); dbContext.SaveChanges();
totalMessage = newRawStock.totalAmount; totalMessage = newRawStock.totalAmount;
} }
@ -2377,13 +2416,64 @@ namespace Khd.Core.Wpf.Form
if (wmsRawStock.totalAmount == 0) if (wmsRawStock.totalAmount == 0)
{ {
dbContext.WmsRawStock.Remove(wmsRawStock); dbContext.WmsRawStock.Remove(wmsRawStock);
dbContext.SaveChanges();
} }
else else
{ {
dbContext.WmsRawStock.Update(wmsRawStock); dbContext.WmsRawStock.Update(wmsRawStock);
dbContext.SaveChanges();
} }
#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.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 else
{ {

Write Preview
Loading…
Cancel
Save