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

change -修改出库组装最后查询库存逻辑，允许为空

Browse Source
master
启龙 曹 7 months ago
parent af439e3834
commit f113432f72
3 changed files with 99 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
src/Khd.Core.Wcs/MainCentralControl.cs
Unescape Escape View File

@ -108,7 +108,7 @@ namespace Khd.Core.Wcs
FiveFloorCTU fiveFloorCTU = new(_host, 5);
fiveFloorCTU.StartPoint();
//五层AGV
五层AGV
FiveFloorAGV fifthFloorAGV = new(_host, 5);
fifthFloorAGV.StartPoint();

20
src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
Unescape Escape View File

@ -687,7 +687,7 @@ namespace Khd.Core.Wcs.Wcs
wmsBaseLocation.updateTime = DateTime.Now;
wmsBaseLocation.updateBy = "WCS";
WmsRawStock wmsRawStock = dbContext.WmsRawStock.First(t => t.locationCode == wmsBaseLocation.locationCode);
WmsRawStock wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
WmsRawOutstockDetail newWmsRawOutstockDetail = new WmsRawOutstockDetail();
@ -697,12 +697,17 @@ namespace Khd.Core.Wcs.Wcs
newWmsRawOutstockDetail.locationCode = wmsRawOutstock.locationCode;
newWmsRawOutstockDetail.materialBarcode = wmsRawOutstock.materialBatch;
newWmsRawOutstockDetail.materialId = wmsRawOutstock.materialId;
MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.Where(t => t.barcodeInfo == wmsRawStock.instockBatch).FirstOrDefault();
if (mesBaseBarcodeInfo != null)
if (wmsRawStock != null)
{
newWmsRawOutstockDetail.instockBatch = mesBaseBarcodeInfo.batchCode;
newWmsRawOutstockDetail.materialProductionDate = mesBaseBarcodeInfo.productionDate;
MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.Where(t => t.barcodeInfo == wmsRawStock.instockBatch).FirstOrDefault();
if (mesBaseBarcodeInfo != null)
{
newWmsRawOutstockDetail.instockBatch = mesBaseBarcodeInfo.batchCode;
newWmsRawOutstockDetail.materialProductionDate = mesBaseBarcodeInfo.productionDate;
}
}
newWmsRawOutstockDetail.planAmount = wmsRawOutstock.outstockAmount;
newWmsRawOutstockDetail.outstockAmount = wmsRawOutstock.realOutstockAmount;
newWmsRawOutstockDetail.executeStatus = "2";
@ -720,7 +725,10 @@ namespace Khd.Core.Wcs.Wcs
dbContext.Update(wmsBaseLocation);
dbContext.WmsRawStock.Where(t => t.locationCode == wmsBaseLocation.locationCode).Delete();
dbContext.Remove(item);
dbContext.Remove(wmsRawStock);
if (wmsRawStock != null)
{
dbContext.Remove(wmsRawStock);
}
dbContext.SaveChanges();
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 });
SystemData.SendPlcLocation(wmsBaseLocation);

84
src/src.sln
Unescape Escape View File

@ -0,0 +1,84 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.2.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Api", "Khd.Core.Api\Khd.Core.Api.csproj", "{89F32EE7-535E-732A-FE66-621DC7F097D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Application", "Khd.Core.Application\Khd.Core.Application.csproj", "{CB696903-5859-D5B3-1A3D-83DB5C486504}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Domain", "Khd.Core.Domain\Khd.Core.Domain.csproj", "{A2F4625B-ABED-9A22-C399-D59E3D14450D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.EntityFramework", "Khd.Core.EntityFramework\Khd.Core.EntityFramework.csproj", "{DC562BA4-97B5-2CF1-4B95-396E33B8639A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Library", "Khd.Core.Library\Khd.Core.Library.csproj", "{C8299FF1-A099-47F1-B2DD-8D231DA536BB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Plc", "Khd.Core.Plc\Khd.Core.Plc.csproj", "{744DA412-A18D-C888-4923-81B2665D240D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Thrift", "Khd.Core.Thrift\Khd.Core.Thrift.csproj", "{C3B7BC04-E1B5-E527-D1A8-78D3C0F86860}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Thrift.Client", "Khd.Core.Thrift.Client\Khd.Core.Thrift.Client.csproj", "{A56CE093-E58D-23A6-61C6-3578C15E9E8B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Thrift.Server", "Khd.Core.Thrift.Server\Khd.Core.Thrift.Server.csproj", "{522F1F82-D8A7-028F-D118-82392493997C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Wcs", "Khd.Core.Wcs\Khd.Core.Wcs.csproj", "{9F81589C-13F9-6C8E-74A2-4B0609BDA2A8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Khd.Core.Wpf", "Khd.Core.Wpf\Khd.Core.Wpf.csproj", "{96A3B801-F98B-C85E-3F6D-0DEC92A692F8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{89F32EE7-535E-732A-FE66-621DC7F097D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89F32EE7-535E-732A-FE66-621DC7F097D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89F32EE7-535E-732A-FE66-621DC7F097D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89F32EE7-535E-732A-FE66-621DC7F097D4}.Release|Any CPU.Build.0 = Release|Any CPU
{CB696903-5859-D5B3-1A3D-83DB5C486504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB696903-5859-D5B3-1A3D-83DB5C486504}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB696903-5859-D5B3-1A3D-83DB5C486504}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB696903-5859-D5B3-1A3D-83DB5C486504}.Release|Any CPU.Build.0 = Release|Any CPU
{A2F4625B-ABED-9A22-C399-D59E3D14450D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2F4625B-ABED-9A22-C399-D59E3D14450D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2F4625B-ABED-9A22-C399-D59E3D14450D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2F4625B-ABED-9A22-C399-D59E3D14450D}.Release|Any CPU.Build.0 = Release|Any CPU
{DC562BA4-97B5-2CF1-4B95-396E33B8639A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC562BA4-97B5-2CF1-4B95-396E33B8639A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC562BA4-97B5-2CF1-4B95-396E33B8639A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC562BA4-97B5-2CF1-4B95-396E33B8639A}.Release|Any CPU.Build.0 = Release|Any CPU
{C8299FF1-A099-47F1-B2DD-8D231DA536BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8299FF1-A099-47F1-B2DD-8D231DA536BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8299FF1-A099-47F1-B2DD-8D231DA536BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8299FF1-A099-47F1-B2DD-8D231DA536BB}.Release|Any CPU.Build.0 = Release|Any CPU
{744DA412-A18D-C888-4923-81B2665D240D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{744DA412-A18D-C888-4923-81B2665D240D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{744DA412-A18D-C888-4923-81B2665D240D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{744DA412-A18D-C888-4923-81B2665D240D}.Release|Any CPU.Build.0 = Release|Any CPU
{C3B7BC04-E1B5-E527-D1A8-78D3C0F86860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3B7BC04-E1B5-E527-D1A8-78D3C0F86860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3B7BC04-E1B5-E527-D1A8-78D3C0F86860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3B7BC04-E1B5-E527-D1A8-78D3C0F86860}.Release|Any CPU.Build.0 = Release|Any CPU
{A56CE093-E58D-23A6-61C6-3578C15E9E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A56CE093-E58D-23A6-61C6-3578C15E9E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A56CE093-E58D-23A6-61C6-3578C15E9E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A56CE093-E58D-23A6-61C6-3578C15E9E8B}.Release|Any CPU.Build.0 = Release|Any CPU
{522F1F82-D8A7-028F-D118-82392493997C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{522F1F82-D8A7-028F-D118-82392493997C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{522F1F82-D8A7-028F-D118-82392493997C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{522F1F82-D8A7-028F-D118-82392493997C}.Release|Any CPU.Build.0 = Release|Any CPU
{9F81589C-13F9-6C8E-74A2-4B0609BDA2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F81589C-13F9-6C8E-74A2-4B0609BDA2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F81589C-13F9-6C8E-74A2-4B0609BDA2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F81589C-13F9-6C8E-74A2-4B0609BDA2A8}.Release|Any CPU.Build.0 = Release|Any CPU
{96A3B801-F98B-C85E-3F6D-0DEC92A692F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96A3B801-F98B-C85E-3F6D-0DEC92A692F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96A3B801-F98B-C85E-3F6D-0DEC92A692F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{96A3B801-F98B-C85E-3F6D-0DEC92A692F8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F3A1081C-95B7-48ED-971B-AA0BA48E23A9}
EndGlobalSection
EndGlobal
Write Preview
Loading…
Cancel
Save