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

change-退库申请单不会有具体物料，只是生成agv任务去取料相关修改；

Browse Source
master
liuwf 1 year ago
parent cb854db880
commit 201d8c3bd3
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -2224,7 +2224,7 @@
<TextBlock x:Name="thisReturnEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0"/> <TextBlock x:Name="thisReturnEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Border BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="8" Grid.RowSpan="2" Margin="20"> <Border Visibility="Collapsed" BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="8" Grid.RowSpan="2" Margin="20">
<DataGrid Background="Transparent" <DataGrid Background="Transparent"
CanUserAddRows="False" CanUserAddRows="False"
AutoGenerateColumns="False" AutoGenerateColumns="False"

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

@ -1716,6 +1716,15 @@ namespace Khd.Core.Wpf.Form
} }
else if (wcsCmd.taskType == 48)//返库 else if (wcsCmd.taskType == 48)//返库
{ {
WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == wcsCmd.currPointNo && t.executeStatus!="2").FirstOrDefault();
if (wmsRawReturn != null)
{
wmsRawReturn.executeStatus = "2";
wmsRawReturn.updateDate = DateTime.Now;
wmsRawReturn.endTime = DateTime.Now;
dbContext.WmsRawReturn.Update(wmsRawReturn);
}
if (wcsCmd.taskStatus == 6) if (wcsCmd.taskStatus == 6)
{ {
wcsCmd.taskStatus = 7; wcsCmd.taskStatus = 7;
@ -2394,18 +2403,18 @@ namespace Khd.Core.Wpf.Form
return; return;
} }
WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == task.currPointNo && t.materialId == material.materialId).FirstOrDefault(); WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == task.currPointNo && t.materialId == material.materialId).FirstOrDefault();
if (wmsRawReturn == null) //if (wmsRawReturn == null)
{ //{
var result = MessageBox.Show("当前物料不在退出申请单中，确定还要入库吗？", "确认入库", MessageBoxButton.YesNo, MessageBoxImage.Question); // var result = MessageBox.Show("当前物料不在退出申请单中，确定还要入库吗？", "确认入库", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result != MessageBoxResult.Yes) // if (result != MessageBoxResult.Yes)
{ // {
txtReturnBarCode.Text = string.Empty; // txtReturnBarCode.Text = string.Empty;
txtReturnBox.Text = string.Empty; // txtReturnBox.Text = string.Empty;
return; // return;
} // }
} //}
var container = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == txtReturnBox.Text && t.warehouseId == 512); var container = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == txtReturnBox.Text && t.warehouseId == 512);
List<WmsRawStock> wmsRawStocks = dbContext.WmsRawStock List<WmsRawStock> wmsRawStocks = dbContext.WmsRawStock
@ -2436,14 +2445,14 @@ namespace Khd.Core.Wpf.Form
} }
if (wmsRawReturn != null) if (wmsRawReturn != null)
{ {
wmsRawReturn.updateDate = DateTime.Now; //wmsRawReturn.updateDate = DateTime.Now;
wmsRawReturn.returnAmount += amount; //wmsRawReturn.returnAmount += amount;
if (wmsRawReturn.returnAmount >= wmsRawReturn.planAmount) //if (wmsRawReturn.returnAmount >= wmsRawReturn.planAmount)
{ //{
wmsRawReturn.executeStatus = "2"; // wmsRawReturn.executeStatus = "2";
wmsRawReturn.endTime = DateTime.Now; // wmsRawReturn.endTime = DateTime.Now;
} //}
dbContext.WmsRawReturn.Update(wmsRawReturn); //dbContext.WmsRawReturn.Update(wmsRawReturn);
WmsRawReturnDetail? wmsRawReturnDetail = new WmsRawReturnDetail(); WmsRawReturnDetail? wmsRawReturnDetail = new WmsRawReturnDetail();
wmsRawReturnDetail.RawReturnId = (long)wmsRawReturn.rawReturnId; wmsRawReturnDetail.RawReturnId = (long)wmsRawReturn.rawReturnId;

Write Preview
Loading…
Cancel
Save