diff --git a/.vs/HighWayIot/FileContentIndex/6ff0634f-4a09-4feb-8f33-97b0726d6438.vsidx b/.vs/HighWayIot/FileContentIndex/6ff0634f-4a09-4feb-8f33-97b0726d6438.vsidx new file mode 100644 index 00000000..495be973 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6ff0634f-4a09-4feb-8f33-97b0726d6438.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/af745379-d4d3-4f69-aadd-e3ba9bed9d07.vsidx b/.vs/HighWayIot/FileContentIndex/af745379-d4d3-4f69-aadd-e3ba9bed9d07.vsidx new file mode 100644 index 00000000..aa1eafeb Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/af745379-d4d3-4f69-aadd-e3ba9bed9d07.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/e068e0a7-d5af-4fc9-a51f-04e93fbf2b00.vsidx b/.vs/HighWayIot/FileContentIndex/e068e0a7-d5af-4fc9-a51f-04e93fbf2b00.vsidx new file mode 100644 index 00000000..b248ae02 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/e068e0a7-d5af-4fc9-a51f-04e93fbf2b00.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/e147b967-24eb-4065-be22-81f7db8f1734.vsidx b/.vs/HighWayIot/FileContentIndex/e147b967-24eb-4065-be22-81f7db8f1734.vsidx new file mode 100644 index 00000000..91f82845 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/e147b967-24eb-4065-be22-81f7db8f1734.vsidx differ diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 82db0ce8..8358645d 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -128,10 +128,11 @@ namespace Aucma.Scada.Business { PrintLogInfoMessage($"扫码成功,物料码:{materialCode}"); string materialType = SubStringMaterialCode(materialCode); + // 加防呆,判断任务表是否有任务了 #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量,改为通过PLC获取货道信息 - var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(appConfig.foamStoreCode, materialType); + // var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(appConfig.foamStoreCode, materialType); #endregion - //var spaceInfo = GetSpaceInfoByMaterialType(appConfig.foamStoreCode, materialType); + var spaceInfo = GetSpaceInfoByMaterialType(appConfig.foamStoreCode, materialType); if (spaceInfo != null) { PrintLogInfoMessage($"匹配货道:{spaceInfo.spaceName}"); @@ -366,8 +367,8 @@ namespace Aucma.Scada.Business if (spaceInfo != null) { spaceInfo.materialType = taskInfo.materialType; - spaceInfo.spaceStock = spaceInfo.spaceStock + 1; - spaceInfo.onRouteAmount -= 1; + //spaceInfo.spaceStock = spaceInfo.spaceStock + 1; + //spaceInfo.onRouteAmount -= 1; //读取PLC获取货道信息:存放数量、在途数量, #region Add By wenjy 2023-10-30 13:44:00 通过PLC获取货道信息 @@ -389,7 +390,7 @@ namespace Aucma.Scada.Business _baseSpaceDetailService.InsertSpaceDetail(spaceDetail); #endregion - #region 添加入库任务 + #region 添加入库记录 RecordInstore recordInstore = new RecordInstore(); recordInstore.storeCode = taskInfo.storeCode; recordInstore.spaceCode = taskInfo.spaceCode; diff --git a/Aucma.Scada.Model/domain/MaterialCompletion.cs b/Aucma.Scada.Model/domain/MaterialCompletion.cs index d2ceb18c..0d1bef39 100644 --- a/Aucma.Scada.Model/domain/MaterialCompletion.cs +++ b/Aucma.Scada.Model/domain/MaterialCompletion.cs @@ -12,7 +12,7 @@ namespace Aucma.Scada.Model.domain /// /// 主键 /// - [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)] + [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true, OracleSequenceName = "SEQ_MATERIAL_COMPLETION")] public int ObjId { get; set; } ///