From db38a36244caaddd417456065ac8954f56886395 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 12月 2024 16:24:18 +0800
Subject: [PATCH] 11
---
CC/iWareSql/WmsDBModel/mes_order_gather.cs | 1
CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs | 5 +
CC/iWareSql/WmsDBModel/mes_package_unline_record.cs | 5 -
CC/iWareSql/WmsDBModel/wms_record_package_process.cs | 46 +++++++++++++++
CC/iWareSql/WmsDBModel/wms_record_upi_process.cs | 57 +++++++++++++++++++
CC/iWareSql/iWareSql.csproj | 3 +
CC/iWareCC_ASRS/ThreadService/00_269工位/DataProcess_269.cs | 5 +
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 6 ++
CC/iWareSql/WmsDBModel/mes_package_gather.cs | 2
CC/iWareSql/WmsDBModel/mes_push_papercut.cs | 2
CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs | 30 ++++++++++
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | 16 ++++
12 files changed, 170 insertions(+), 8 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs" "b/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
index 8a2e4c3..3bb1907 100644
--- "a/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
@@ -34,7 +34,8 @@
SystemWarningMsg._lbl_alert_DataProcess_269 = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_269 && SystemValue.isStartedModel)
+ //if (SystemValue.isAllowRuning_DataProcess_269 && SystemValue.isStartedModel)
+ if (SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString();
/*
@@ -75,6 +76,6 @@
}
}
-
+
}
}
diff --git a/CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs b/CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs
new file mode 100644
index 0000000..a95831f
--- /dev/null
+++ b/CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs
@@ -0,0 +1,30 @@
+锘�
+
+using iWareCommon.Utils;
+using iWareModel.Entity.AGV;
+using iWareModel.EnumType.EDevice.AGV;
+using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace iWareSql.DataAccess
+{
+ public class WmsRecordUpiProcessHandler
+ {
+ /// <summary>
+ /// 淇濆瓨AGV瀹炴椂鏁版嵁
+ /// </summary>
+ /// <param name="vehicles"></param>
+ public static void SaveAgvData(mes_batchOrderUPI_new orderUPI_New )
+ {
+ wms_record_upi_process upi_Process = new wms_record_upi_process()
+ {
+
+ };
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index 4f6ce0e..216851a 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -78,8 +78,10 @@
public virtual DbSet<wms_log_action> wms_log_action { get; set; }
public virtual DbSet<wms_rbline_runmode> wms_rbline_runmode { get; set; }
public virtual DbSet<wms_rbline_task> wms_rbline_task { get; set; }
+ public virtual DbSet<wms_record_package_process> wms_record_package_process { get; set; }
public virtual DbSet<wms_record_print> wms_record_print { get; set; }
public virtual DbSet<wms_record_trans> wms_record_trans { get; set; }
+ public virtual DbSet<wms_record_upi_process> wms_record_upi_process { get; set; }
public virtual DbSet<wms_stock_quan> wms_stock_quan { get; set; }
public virtual DbSet<wms_sys_basic_data> wms_sys_basic_data { get; set; }
public virtual DbSet<wms_sys_help_doc> wms_sys_help_doc { get; set; }
@@ -97,6 +99,10 @@
protected override void OnModelCreating(DbModelBuilder modelBuilder)
{
+ modelBuilder.Entity<mes_batchOrderUPI_new>()
+ .Property(e => e.Info18)
+ .IsUnicode(false);
+
modelBuilder.Entity<mes_order_gather>()
.Property(e => e.AllPackageArea)
.HasPrecision(18, 4);
diff --git a/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs b/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
index 68516ce..7b192da 100644
--- a/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
+++ b/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
@@ -115,5 +115,10 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ public int? UpiFlag { get; set; }
+
+ [StringLength(60)]
+ public string Info18 { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_order_gather.cs b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
index 97a68e7..062c11a 100644
--- a/CC/iWareSql/WmsDBModel/mes_order_gather.cs
+++ b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
@@ -28,6 +28,7 @@
public DateTime? UnlineTime { get; set; }
+ [StringLength(50)]
public string UnlinePerson { get; set; }
public int PackageNum { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_package_gather.cs b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
index d3a0f82..080f3e2 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_gather.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
@@ -77,5 +77,7 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ public int? UpiFlag { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
index 3c256f1..a4630b9 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
@@ -15,6 +15,8 @@
[StringLength(50)]
public string PackageCode { get; set; }
+ public int? UpiFlag { get; set; }
+
[StringLength(60)]
public string Info5 { get; set; }
@@ -74,8 +76,5 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
index bb64f9d..a35a915 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -19,7 +19,7 @@
public DateTime? PushTime { get; set; }
- public int PushNum { get; set; } = 0;
+ public int PushNum { get; set; }
[Required]
[StringLength(50)]
diff --git a/CC/iWareSql/WmsDBModel/wms_record_package_process.cs b/CC/iWareSql/WmsDBModel/wms_record_package_process.cs
new file mode 100644
index 0000000..18b44e2
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/wms_record_package_process.cs
@@ -0,0 +1,46 @@
+namespace iWareSql.WmsDBModel
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class wms_record_package_process
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ public int UpiStatus { get; set; }
+
+ public int? UpiFlag { get; set; }
+
+ [StringLength(255)]
+ public string Location { get; set; }
+
+ [StringLength(100)]
+ public string OperRemark { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+ }
+}
diff --git a/CC/iWareSql/WmsDBModel/wms_record_upi_process.cs b/CC/iWareSql/WmsDBModel/wms_record_upi_process.cs
new file mode 100644
index 0000000..6c11860
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/wms_record_upi_process.cs
@@ -0,0 +1,57 @@
+namespace iWareSql.WmsDBModel
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class wms_record_upi_process
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string Upi { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ public int UpiStatus { get; set; }
+
+ public int? UpiFlag { get; set; }
+
+ [StringLength(255)]
+ public string Location { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string DetailName { get; set; }
+
+ [StringLength(60)]
+ public string Info18 { get; set; }
+
+ [StringLength(100)]
+ public string OperRemark { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+ }
+}
diff --git a/CC/iWareSql/iWareSql.csproj b/CC/iWareSql/iWareSql.csproj
index 6792926..ec058e4 100644
--- a/CC/iWareSql/iWareSql.csproj
+++ b/CC/iWareSql/iWareSql.csproj
@@ -55,6 +55,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="DataAccess\WmsRecordUpiProcessHandler.cs" />
<Compile Include="DataAccess\TaskHandler.cs" />
<Compile Include="DataAccess\AgvHandler.cs" />
<Compile Include="DataAccess\Base_CodeItemsHandler.cs" />
@@ -226,8 +227,10 @@
<Compile Include="WmsDBModel\wms_log_action.cs" />
<Compile Include="WmsDBModel\wms_rbline_runmode.cs" />
<Compile Include="WmsDBModel\wms_rbline_task.cs" />
+ <Compile Include="WmsDBModel\wms_record_package_process.cs" />
<Compile Include="WmsDBModel\wms_record_print.cs" />
<Compile Include="WmsDBModel\wms_record_trans.cs" />
+ <Compile Include="WmsDBModel\wms_record_upi_process.cs" />
<Compile Include="WmsDBModel\wms_stock_quan.cs" />
<Compile Include="WmsDBModel\wms_sys_basic_data.cs" />
<Compile Include="WmsDBModel\wms_sys_help_doc.cs" />
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 8eed4ed..d55221d 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -25,6 +25,8 @@
public static string W_DBHeaderWithSeparate_BZ21 = "3004" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
public static string W_DBHeaderWithSeparate_BZ30 = "3005" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+ public static string W_DBHeaderWithSeparate_269 = "3006" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+
/// <summary>
/// 璇诲彇DB
/// </summary>
@@ -150,6 +152,8 @@
_dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
{
StationCode = StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString(),
+
+ W_DataFinish = W_DBHeaderWithSeparate_269 + "0.0",
});
_dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
{
@@ -190,7 +194,7 @@
W_DataFinish = W_DBHeaderWithSeparate_BZ12 + "0.0",
W_EndMark = W_DBHeaderWithSeparate_BZ12 + "0.1",
- W_FirstMark= W_DBHeaderWithSeparate_BZ12 + "0.3",
+ W_FirstMark = W_DBHeaderWithSeparate_BZ12 + "0.3",
W_PalletizingPlaceX = W_DBHeaderWithSeparate_BZ12 + "12.0",
W_PalletizingPlaceY = W_DBHeaderWithSeparate_BZ12 + "14.0",
W_PalletizingPlaceZ = W_DBHeaderWithSeparate_BZ12 + "16.0",
@@ -201,7 +205,7 @@
W_Length = W_DBHeaderWithSeparate_BZ12 + "2.0",
W_Width = W_DBHeaderWithSeparate_BZ12 + "4.0",
W_Height = W_DBHeaderWithSeparate_BZ12 + "6.0",
- W_PalletizingBucketType= W_DBHeaderWithSeparate_BZ12 + "20.0",
+ W_PalletizingBucketType = W_DBHeaderWithSeparate_BZ12 + "20.0",
W_PalletizingStation = W_DBHeaderWithSeparate_BZ12 + "10.0",
W_PalletizingTaskFinish = W_DBHeaderWithSeparate_BZ12 + "0.2",
});
@@ -246,6 +250,14 @@
_dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
{
+ StationCode = StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString(),
+
+ R_ReqParseData = W_DBHeaderWithSeparate_269 + "50.0",
+ R_ReadCodeResult = W_DBHeaderWithSeparate_269 + "52.0",
+ });
+
+ _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
+ {
StationCode = StationLocationEnum.BZ01.ToString(),
R_ReqParseData = W_DBHeaderWithSeparate_BZ01 + "50.0",
--
Gitblit v1.9.3