diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index e26dcf6..040b7da 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2320,7 +2320,7 @@
-
+
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index d18c548..8179ee1 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -333,7 +333,7 @@ namespace Khd.Core.Wpf.Form
}
Visibility isFreeze = targetLocation.locationStatus == "1" ? Visibility.Collapsed : Visibility.Visible;
- locations.Add(new Location { LocationId = targetLocation.locationId, Code = targetLocation.locColumn.ToString(), Status = status ,isFreeze = isFreeze});
+ locations.Add(new Location { LocationId = targetLocation.locationId, Code = targetLocation.locColumn.ToString(), Status = status, isFreeze = isFreeze });
}
LocationsControl.ItemsSource = locations;
@@ -452,6 +452,7 @@ namespace Khd.Core.Wpf.Form
{
}
+ Thread.Sleep(1000);
}
}
@@ -476,9 +477,25 @@ namespace Khd.Core.Wpf.Form
BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
string nowStationCode = baseEquip.endStationCode;
+ if (!string.IsNullOrEmpty(nowStationCode))
+ {
+ Dispatcher.Invoke(() =>
+ {
+ SelectOutButton.Content = "当前:" + nowStationCode;
+ //SelectOutButton.IsEnabled = false;
+ });
+ }
+ else
+ {
+ Dispatcher.Invoke(() =>
+ {
+ SelectOutButton.Content = "选择出库";
+ //SelectOutButton.IsEnabled = true;
+ });
+ }
Dispatcher.Invoke(() =>
{
- this.OutOrder.Text = "当前:" + nowStationCode + "\n" + "待出库单：\n" + list.Distinct().Join("\n");
+ this.OutOrder.Text = "待出库单：\n" + list.Distinct().Join("\n");
});
@@ -616,7 +633,7 @@ namespace Khd.Core.Wpf.Form
{
}
- Thread.Sleep(1000);
+ Thread.Sleep(2000);
}
}
@@ -1477,7 +1494,7 @@ namespace Khd.Core.Wpf.Form
baseEquip.endStationCode = string.Empty;
baseEquip.ud3 = null;
dbContext.Update(baseEquip);
-
+
}
}
@@ -1488,7 +1505,7 @@ namespace Khd.Core.Wpf.Form
baseEquip.ud3 = null;
dbContext.Update(baseEquip);
dbContext.SaveChanges();
-
+
}
if (wcsCmd.taskStatus == 3)
@@ -1508,7 +1525,7 @@ namespace Khd.Core.Wpf.Form
HandyControl.Controls.MessageBox.Success("背负式Agv任务确认完成成功");
}
}
-
+
}
catch (Exception ex)
{
@@ -2063,7 +2080,7 @@ namespace Khd.Core.Wpf.Form
List wmsRawStocks = dbContext.WmsRawStock
.Where(t => txtInBarCode.Text == t.instockBatch)
.Where(t => t.warehouseFloor == 5 && t.warehouseId == 512).ToList();
- if (wmsRawStocks.Count > 0 && material.batchFlag!="1")
+ if (wmsRawStocks.Count > 0 && material.batchFlag != "1")
{
HandyControl.Controls.MessageBox.Info($"该条码已入库!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}");
txtInBarCode.Text = string.Empty;
@@ -2086,13 +2103,13 @@ namespace Khd.Core.Wpf.Form
decimal amount = decimal.Parse(txtInScan.Text);
wmsRawReturn.returnAmount += amount;
- if(wmsRawReturn.returnAmount >= wmsRawReturn.planAmount)
+ if (wmsRawReturn.returnAmount >= wmsRawReturn.planAmount)
{
wmsRawReturn.executeStatus = "2";
wmsRawReturn.endTime = DateTime.Now;
}
- WmsRawReturnDetail ? wmsRawReturnDetail = new WmsRawReturnDetail();
+ WmsRawReturnDetail? wmsRawReturnDetail = new WmsRawReturnDetail();
wmsRawReturnDetail.RawReturnId = (long)wmsRawReturn.rawReturnId;
wmsRawReturnDetail.LocationCode = container.locationCode;
wmsRawReturnDetail.MaterialBarcode = txtInBarCode.Text;
@@ -2109,7 +2126,7 @@ namespace Khd.Core.Wpf.Form
wmsRawReturnDetail.CreateBy = "WPF";
wmsRawReturnDetail.CreateDate = DateTime.Now;
-
+
if (wmsRawStocks.Count > 0)
{ // 批次条码并且有库存
var newRawStock = wmsRawStocks.First();
@@ -2143,7 +2160,7 @@ namespace Khd.Core.Wpf.Form
};
dbContext.WmsRawStock.Add(newRawStock);
}
-
+
dbContext.SaveChanges();
HandyControl.Controls.MessageBox.Success("入库成功!");
txtInBarCode.Text = string.Empty;
@@ -2490,7 +2507,7 @@ namespace Khd.Core.Wpf.Form
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)
@@ -2571,13 +2588,13 @@ namespace Khd.Core.Wpf.Form
{
// 没有申请单
// 如果选中了出库单，并且无需要出库的申请单，则禁止出库
-
+
if (!string.IsNullOrEmpty(baseEquip.endStationCode))
{
scanOutMsg.Text = "申请单里该条码无需出库！";
return;
}
- if(wmsRawStock.safeFlag!= "1")
+ if (wmsRawStock.safeFlag != "1")
{
scanOutMsg.Text = "该条码不是安全库存，且无申请单，禁止出库！";
return;
@@ -2768,7 +2785,7 @@ namespace Khd.Core.Wpf.Form
materialSpec = c.MaterialSpec,
palletInfoCode = b.palletInfoCode,
//instockDate = b.instockDate,
- totalAmount = Math.Round((decimal)b.totalAmount,2),
+ totalAmount = Math.Round((decimal)b.totalAmount, 2),
frozenAmount = Math.Round((decimal)b.frozenAmount, 2),
IsSelected = CallSelectedItem.Contains(a.locationId)
};
@@ -4481,7 +4498,7 @@ namespace Khd.Core.Wpf.Form
rawSourceMaterialName.Text = mesBaseMaterialInfo.MaterialName;
rawSourceMaterialSpec.Text = mesBaseMaterialInfo.MaterialSpec;
this.removeScan.Text = string.Format("{0:0.00}", wmsRawStock.totalAmount - wmsRawStock.frozenAmount);
-
+
removeSourceBox.Focus();
}
}
@@ -4534,7 +4551,7 @@ namespace Khd.Core.Wpf.Form
// removeSourceMaterialSpec.Text = "";
// return;
//}
-
+
var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == barCode);
if (material == null)
{
@@ -4596,7 +4613,7 @@ namespace Khd.Core.Wpf.Form
return;
}
decimal amount = decimal.Parse(this.removeScan.Text);
- if (amount<=0)
+ if (amount <= 0)
{
this.RemoveMsg.Text = "移库数量需要大于0!";
return;
@@ -4606,14 +4623,14 @@ namespace Khd.Core.Wpf.Form
using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService();
- WmsRawStock? sourceWmsRawStock = dbContext.WmsRawStock
+ WmsRawStock? sourceWmsRawStock = dbContext.WmsRawStock
.Where(t => t.instockBatch == this.rawSourceBarCode.Text).FirstOrDefault();
if (sourceWmsRawStock == null)
{
this.RemoveMsg.Text = "该条码无库存，请核查";
return;
}
- if (amount > (sourceWmsRawStock.totalAmount- sourceWmsRawStock.frozenAmount))
+ if (amount > (sourceWmsRawStock.totalAmount - sourceWmsRawStock.frozenAmount))
{
this.RemoveMsg.Text = "移库数量不能大于库存数量";
return;
@@ -4694,15 +4711,15 @@ namespace Khd.Core.Wpf.Form
wmsMove.PlanAmount = decimal.Parse(this.removeScan.Text);
wmsMove.RealOutstockAmount = decimal.Parse(this.removeScan.Text);
wmsMove.RealInstockAmount = decimal.Parse(this.removeScan.Text);
- wmsMove.OperationType = "1" ;
- wmsMove.MoveWay = "1" ;
- wmsMove.MoveType = "1" ;
- wmsMove.AuditStatus = "1" ;
- wmsMove.ExecuteStatus = "2" ;
- wmsMove.UpdateBy = "WPF" ;
- wmsMove.UpdateDate = DateTime.Now ;
- wmsMove.BeginTime = DateTime.Now ;
- wmsMove.EndTime = DateTime.Now ;
+ wmsMove.OperationType = "1";
+ wmsMove.MoveWay = "1";
+ wmsMove.MoveType = "1";
+ wmsMove.AuditStatus = "1";
+ wmsMove.ExecuteStatus = "2";
+ wmsMove.UpdateBy = "WPF";
+ wmsMove.UpdateDate = DateTime.Now;
+ wmsMove.BeginTime = DateTime.Now;
+ wmsMove.EndTime = DateTime.Now;
WmsMoveDetail wmsMoveDetail = new WmsMoveDetail();
wmsMoveDetail.MoveId = wmsMove.MoveId;
@@ -4725,7 +4742,7 @@ namespace Khd.Core.Wpf.Form
#endregion
dbContext.SaveChanges();
-
+
this.RemoveMsg.Text = $"移库成功!,原料箱库存:{string.Format("{0:0.00}", sourceWmsRawStock.totalAmount)},新料箱库存:{string.Format("{0:0.00}", removeStock.totalAmount)}";
removeSourceBarCode.Text = string.Empty;
removeSourceMaterialName.Text = "";
@@ -4738,7 +4755,7 @@ namespace Khd.Core.Wpf.Form
}
catch (Exception ex)
{
- Console.Write("移库失败!,异常:"+ ex.Message);
+ Console.Write("移库失败!,异常:" + ex.Message);
}
}