From aa1fa59aef9c9a115dee92e505752c9a8e7b7265 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 28 11月 2024 09:43:56 +0800
Subject: [PATCH] 22
---
CC/iWareSql/WmsDBModel/V_Station_Quan.cs | 134 ++++++++
CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs | 61 +--
LA24030_LuLiPackageLine_Web/index.html | 2
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs | 6
CC/iWareSql/WmsDBModel/mes_package_linequeue.cs | 82 +++++
CC/iWareSql/WmsDBModel/mes_push_packagecode.cs | 4
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs | 81 +++++
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs | 10
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj | 6
CC/iWareSql/WmsDBModel/mes_package_gather.cs | 82 +++++
/dev/null | 46 ---
CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs | 7
CC/iWareSql/WmsDBModel/mes_package_unline_record.cs | 81 +++++
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs | 4
LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw | 0
CC/iWareSql/DataAccess/TCSCommon.cs | 20 -
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs | 82 +++++
CC/iWareSql/iWareSql.csproj | 7
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 3
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 28 +
CC/iWareSql/WmsDBModel/mes_push_papercut.cs | 10
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs | 82 +++++
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21.cs | 6
23 files changed, 721 insertions(+), 123 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
index dd8fd0e..9f681ac 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
@@ -92,7 +92,7 @@
//璁板綍浠诲姟
var _id = Yitter.IdGenerator.YitIdHelper.NextId();
var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
- var putpakegecode = new mes_PushPackageCode()
+ var putpakegecode = new mes_push_packagecode()
{
Id = _id,
PackageCode=upiObj.PackageCode,
@@ -128,7 +128,7 @@
};
wmsDB.wms_rbline_task.Add(task);
- wmsDB.mes_PushPackageCode.Add(putpakegecode);
+ wmsDB.mes_push_packagecode.Add(putpakegecode);
using (StationServiceClient client = new StationServiceClient())
{
@@ -164,7 +164,7 @@
Thread.Sleep(2000);
using (WmsDBModel edm = new WmsDBModel())
{
- var value = edm.mes_PushPackageCode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
+ var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
if (value != null)
{
PushPackageCodeInput input = new PushPackageCodeInput();
diff --git a/CC/iWareSql/DataAccess/TCSCommon.cs b/CC/iWareSql/DataAccess/TCSCommon.cs
index 2c28909..aefe0af 100644
--- a/CC/iWareSql/DataAccess/TCSCommon.cs
+++ b/CC/iWareSql/DataAccess/TCSCommon.cs
@@ -47,26 +47,6 @@
return PlaceType;
}
- /// <summary>
- /// 鏍规嵁瀹為檯鎯呭喌杞崲闀垮拰瀹�
- /// </summary>
- /// <param name="UpiInfo"></param>
- /// <param name="PhysicalLength">鐗╃悊闀垮害</param>
- /// <param name="PhysicalWidth">鐗╃悊瀹藉害</param>
- private static void GetPhysicalWidthLength(mes_batchOrderUPI_new UpiInfo, ref double PhysicalLength, ref double PhysicalWidth)
- {
- if (UpiInfo.Rotation > 0)
- {//濡傛灉鏄洓闈㈤捇锛岀墿鐞嗛暱鍜屽瀵硅皟
- PhysicalWidth = UpiInfo.Length;
- PhysicalLength = UpiInfo.Width;
- }
- else
- {
- PhysicalLength = UpiInfo.Length;
- PhysicalWidth = UpiInfo.Width;
- }
- }
-
}
}
diff --git a/CC/iWareSql/WmsDBModel/V_Station_Quan.cs b/CC/iWareSql/WmsDBModel/V_Station_Quan.cs
new file mode 100644
index 0000000..9c6aed0
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/V_Station_Quan.cs
@@ -0,0 +1,134 @@
+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 V_Station_Quan
+ {
+ [Key]
+ [Column(Order = 0)]
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Key]
+ [Column(Order = 1)]
+ [StringLength(50)]
+ public string PlaceCode { get; set; }
+
+ [Key]
+ [Column(Order = 2)]
+ [StringLength(50)]
+ public string PlaceName { get; set; }
+
+ [Key]
+ [Column(Order = 3)]
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public int PlaceType { get; set; }
+
+ [StringLength(50)]
+ public string PlaceTypeName { get; set; }
+
+ public decimal? stationLength { get; set; }
+
+ public decimal? Width { get; set; }
+
+ public decimal? Height { get; set; }
+
+ public decimal? Thick { get; set; }
+
+ [Key]
+ [Column(Order = 4)]
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public int PlaceStatus { get; set; }
+
+ [Key]
+ [Column(Order = 5)]
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long AreaId { get; set; }
+
+ [StringLength(50)]
+ public string AreaCode { get; set; }
+
+ [StringLength(50)]
+ public string AreaName { get; set; }
+
+ public int? RowNo { get; set; }
+
+ public int? ColumnNo { get; set; }
+
+ public int? LayerNo { get; set; }
+
+ public int? LaneNo { get; set; }
+
+ public bool? IsVirtually { get; set; }
+
+ [Key]
+ [Column(Order = 6)]
+ public bool IsDisabled { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ [Key]
+ [Column(Order = 7)]
+ public bool IsDelete { get; set; }
+
+ public DateTime? InTime { get; set; }
+
+ [StringLength(100)]
+ public string Upi { get; set; }
+
+ [StringLength(100)]
+ public string DetailName { get; set; }
+
+ [StringLength(100)]
+ public string PlanNo { get; set; }
+
+ [StringLength(100)]
+ public string OrderId { get; set; }
+
+ [StringLength(100)]
+ public string PackageCode { get; set; }
+
+ public double? Length { get; set; }
+
+ public double? Thk { get; set; }
+
+ public int? StockStatus { get; set; }
+
+ [StringLength(50)]
+ public string StockStatusName { get; set; }
+
+ [StringLength(255)]
+ public string OperReason { get; set; }
+
+ [StringLength(50)]
+ public string OperUser { get; set; }
+
+ public DateTime? OperTime { get; set; }
+
+ public int? LockStatus { get; set; }
+
+ [StringLength(255)]
+ public string LockReason { get; set; }
+
+ [StringLength(50)]
+ public string LockUser { get; set; }
+
+ public DateTime? LockTime { get; set; }
+ }
+}
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index b125ac9..7a01456 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -11,12 +11,17 @@
: base("name=WmsDBModel")
{
}
- public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
- public virtual DbSet<mes_PushPackageCode> mes_PushPackageCode { get; set; }
+
public virtual DbSet<ApprovalFlow> ApprovalFlow { get; set; }
public virtual DbSet<DingTalkUser> DingTalkUser { get; set; }
public virtual DbSet<GoViewPro> GoViewPro { get; set; }
public virtual DbSet<GoViewProData> GoViewProData { get; set; }
+ public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
+ public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
+ public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
+ public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }
+ public virtual DbSet<mes_push_packagecode> mes_push_packagecode { get; set; }
+ public virtual DbSet<mes_push_papercut> mes_push_papercut { get; set; }
public virtual DbSet<SysCodeGen> SysCodeGen { get; set; }
public virtual DbSet<SysCodeGenConfig> SysCodeGenConfig { get; set; }
public virtual DbSet<SysConfig> SysConfig { get; set; }
@@ -87,6 +92,7 @@
public virtual DbSet<zero_interface_list> zero_interface_list { get; set; }
public virtual DbSet<zero_user_info> zero_user_info { get; set; }
public virtual DbSet<V_EmptyStation> V_EmptyStation { get; set; }
+ public virtual DbSet<V_Station_Quan> V_Station_Quan { get; set; }
protected override void OnModelCreating(DbModelBuilder modelBuilder)
{
@@ -150,8 +156,6 @@
.Property(e => e.Height)
.HasPrecision(10, 3);
-
-
modelBuilder.Entity<wms_record_trans>()
.Property(e => e.SourceQuantity)
.HasPrecision(10, 3);
@@ -179,6 +183,22 @@
modelBuilder.Entity<V_EmptyStation>()
.Property(e => e.Thick)
.HasPrecision(10, 3);
+
+ modelBuilder.Entity<V_Station_Quan>()
+ .Property(e => e.stationLength)
+ .HasPrecision(10, 3);
+
+ modelBuilder.Entity<V_Station_Quan>()
+ .Property(e => e.Width)
+ .HasPrecision(10, 3);
+
+ modelBuilder.Entity<V_Station_Quan>()
+ .Property(e => e.Height)
+ .HasPrecision(10, 3);
+
+ modelBuilder.Entity<V_Station_Quan>()
+ .Property(e => e.Thick)
+ .HasPrecision(10, 3);
}
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_PushPackageCode.cs b/CC/iWareSql/WmsDBModel/mes_PushPackageCode.cs
deleted file mode 100644
index 98faf02..0000000
--- a/CC/iWareSql/WmsDBModel/mes_PushPackageCode.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-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 mes_PushPackageCode
- {
- [DatabaseGenerated(DatabaseGeneratedOption.None)]
- public long Id { get; set; }
-
- [Required]
- [StringLength(50)]
- public string PackageCode { get; set; }
-
- public int PushStatus { get; set; }
-
- public int PushNum { get; set; }
-
- [StringLength(50)]
- public string ApiMessage { get; set; }
-
- public DateTime? CreateTime { get; set; }
-
- public DateTime? UpdateTime { get; set; }
-
- public long? CreateUserId { get; set; }
-
- [StringLength(64)]
- public string CreateUserName { get; set; }
-
- public long? UpdateUserId { get; set; }
-
- [StringLength(64)]
- public string UpdateUserName { get; set; }
-
- public long? CreateOrgId { get; set; }
-
- [StringLength(64)]
- public string CreateOrgName { get; set; }
-
- public bool IsDelete { get; set; }
- }
-}
diff --git a/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs b/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
index 91256a6..68516ce 100644
--- a/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
+++ b/CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
@@ -11,9 +11,9 @@
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public long Id { get; set; }
- public int? AreaCode { get; set; }
-
- public int UpiStatus { get; set; }
+ [Required]
+ [StringLength(50)]
+ public string UPI { get; set; }
[Required]
[StringLength(50)]
@@ -23,9 +23,12 @@
[StringLength(50)]
public string OrderId { get; set; }
- [Required]
- [StringLength(50)]
- public string UPI { get; set; }
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ public int? AreaCode { get; set; }
+
+ public int UpiStatus { get; set; }
[Required]
[StringLength(50)]
@@ -37,16 +40,7 @@
public double Thk { get; set; }
- [StringLength(50)]
- public string Matgrid { get; set; }
-
- public int? IsEB { get; set; }
-
- public int? DRNum { get; set; }
-
public int? IsPA { get; set; }
-
- public int? MaterialIndeX { get; set; }
[Required]
[StringLength(50)]
@@ -62,35 +56,14 @@
public int? Shelf { get; set; }
- public double? Rotation { get; set; }
-
public double? Info1 { get; set; }
public double? Info2 { get; set; }
public double? Info3 { get; set; }
- public DateTime? CreateTime { get; set; }
-
- public DateTime? UpdateTime { get; set; }
-
- public long? CreateUserId { get; set; }
-
- [StringLength(64)]
- public string CreateUserName { get; set; }
-
- public long? UpdateUserId { get; set; }
-
- [StringLength(64)]
- public string UpdateUserName { get; set; }
-
- public bool IsDelete { get; set; }
-
[StringLength(60)]
public string Info4 { get; set; }
-
- [StringLength(60)]
- public string Info5 { get; set; }
[StringLength(60)]
public string Info6 { get; set; }
@@ -126,5 +99,21 @@
[StringLength(60)]
public string Info17 { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_gather.cs b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
new file mode 100644
index 0000000..e032b15
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
@@ -0,0 +1,82 @@
+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 mes_package_gather
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ public int? AreaCode { get; set; }
+
+ public int UpiStatus { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
+ [StringLength(60)]
+ public string Info4 { get; set; }
+
+ [StringLength(60)]
+ public string Info6 { get; set; }
+
+ [StringLength(60)]
+ public string Info7 { get; set; }
+
+ [StringLength(60)]
+ public string Info8 { get; set; }
+
+ [StringLength(60)]
+ public string Info10 { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
+
+ [StringLength(60)]
+ public string Info11 { get; set; }
+
+ [StringLength(60)]
+ public string Info12 { get; set; }
+
+ [StringLength(60)]
+ public string Info13 { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs b/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
new file mode 100644
index 0000000..d5d5455
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
@@ -0,0 +1,82 @@
+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 mes_package_linequeue
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ public int? AreaCode { get; set; }
+
+ public int UpiStatus { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
+ [StringLength(60)]
+ public string Info4 { get; set; }
+
+ [StringLength(60)]
+ public string Info6 { get; set; }
+
+ [StringLength(60)]
+ public string Info7 { get; set; }
+
+ [StringLength(60)]
+ public string Info8 { get; set; }
+
+ [StringLength(60)]
+ public string Info10 { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
+
+ [StringLength(60)]
+ public string Info11 { get; set; }
+
+ [StringLength(60)]
+ public string Info12 { get; set; }
+
+ [StringLength(60)]
+ public string Info13 { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
new file mode 100644
index 0000000..4188c52
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
@@ -0,0 +1,81 @@
+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 mes_package_unline_record
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
+ [StringLength(60)]
+ public string Info4 { get; set; }
+
+ [StringLength(60)]
+ public string Info6 { get; set; }
+
+ [StringLength(60)]
+ public string Info7 { get; set; }
+
+ [StringLength(60)]
+ public string Info8 { get; set; }
+
+ [StringLength(60)]
+ public string Info10 { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
+
+ [StringLength(60)]
+ public string Info11 { get; set; }
+
+ [StringLength(60)]
+ public string Info12 { get; set; }
+
+ [StringLength(60)]
+ public string Info13 { get; set; }
+
+ [StringLength(60)]
+ public string OpRemark { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs b/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
similarity index 91%
copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
copy to CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
index b1d6e3e..9ac912f 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
@@ -6,7 +6,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.Spatial;
- public partial class mes_PushPackageCode
+ public partial class mes_push_packagecode
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public long Id { get; set; }
@@ -17,6 +17,8 @@
public int PushStatus { get; set; }
+ public DateTime? PushTime { get; set; }
+
public int PushNum { get; set; }
[Required]
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
similarity index 83%
copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
copy to CC/iWareSql/WmsDBModel/mes_push_papercut.cs
index b1d6e3e..eb45ef9 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -6,7 +6,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.Spatial;
- public partial class mes_PushPackageCode
+ public partial class mes_push_papercut
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public long Id { get; set; }
@@ -15,8 +15,16 @@
[StringLength(50)]
public string PackageCode { get; set; }
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
public int PushStatus { get; set; }
+ public DateTime? PushTime { get; set; }
+
public int PushNum { get; set; }
[Required]
diff --git a/CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs b/CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs
index 05254f5..5c7e04b 100644
--- a/CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs
+++ b/CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs
@@ -44,14 +44,9 @@
public bool IsDelete { get; set; }
- /// <summary>
- /// 上一次码垛编号
- /// </summary>
+ [StringLength(50)]
public string PalletizingUPI { get; set; }
- /// <summary>
- /// 上一次码垛站点
- /// </summary>
public int? PalletizingStation { get; set; }
}
}
diff --git a/CC/iWareSql/iWareSql.csproj b/CC/iWareSql/iWareSql.csproj
index a98b3f6..fd8f79b 100644
--- a/CC/iWareSql/iWareSql.csproj
+++ b/CC/iWareSql/iWareSql.csproj
@@ -162,7 +162,11 @@
<Compile Include="WmsDBModel\GoViewPro.cs" />
<Compile Include="WmsDBModel\GoViewProData.cs" />
<Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" />
- <Compile Include="WmsDBModel\mes_PushPackageCode.cs" />
+ <Compile Include="WmsDBModel\mes_package_gather.cs" />
+ <Compile Include="WmsDBModel\mes_package_linequeue.cs" />
+ <Compile Include="WmsDBModel\mes_package_unline_record.cs" />
+ <Compile Include="WmsDBModel\mes_push_packagecode.cs" />
+ <Compile Include="WmsDBModel\mes_push_papercut.cs" />
<Compile Include="WmsDBModel\SysCodeGen.cs" />
<Compile Include="WmsDBModel\SysCodeGenConfig.cs" />
<Compile Include="WmsDBModel\SysConfig.cs" />
@@ -202,6 +206,7 @@
<Compile Include="WmsDBModel\Test_Student.cs" />
<Compile Include="WmsDBModel\Test_Teachert.cs" />
<Compile Include="WmsDBModel\V_EmptyStation.cs" />
+ <Compile Include="WmsDBModel\V_Station_Quan.cs" />
<Compile Include="WmsDBModel\WmsDBModel.cs" />
<Compile Include="WmsDBModel\wms_adapter_categories.cs" />
<Compile Include="WmsDBModel\wms_adapter_management.cs" />
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index b95fc70..2ac9750 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -325,6 +325,9 @@
data.Add("Info13", item.Info13 ?? "");//褰撳墠鍖呴潰绉�
data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ //mycontext.mes
+ data.Add("leijisaomiaomj", item.Info13 ?? "");//绱鎵弿闈㈢Н
+
//鏌ヨ涓� 鍖呮暟鎹�
var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
var gg = mylist.GroupBy(x => x.DetailName);
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs
index 76f17fe..7a01456 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -17,7 +17,11 @@
public virtual DbSet<GoViewPro> GoViewPro { get; set; }
public virtual DbSet<GoViewProData> GoViewProData { get; set; }
public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
- public virtual DbSet<mes_PushPackageCode> mes_PushPackageCode { get; set; }
+ public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
+ public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
+ public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }
+ public virtual DbSet<mes_push_packagecode> mes_push_packagecode { get; set; }
+ public virtual DbSet<mes_push_papercut> mes_push_papercut { get; set; }
public virtual DbSet<SysCodeGen> SysCodeGen { get; set; }
public virtual DbSet<SysCodeGenConfig> SysCodeGenConfig { get; set; }
public virtual DbSet<SysConfig> SysConfig { get; set; }
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs
new file mode 100644
index 0000000..e032b15
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs
@@ -0,0 +1,82 @@
+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 mes_package_gather
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ public int? AreaCode { get; set; }
+
+ public int UpiStatus { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
+ [StringLength(60)]
+ public string Info4 { get; set; }
+
+ [StringLength(60)]
+ public string Info6 { get; set; }
+
+ [StringLength(60)]
+ public string Info7 { get; set; }
+
+ [StringLength(60)]
+ public string Info8 { get; set; }
+
+ [StringLength(60)]
+ public string Info10 { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
+
+ [StringLength(60)]
+ public string Info11 { get; set; }
+
+ [StringLength(60)]
+ public string Info12 { get; set; }
+
+ [StringLength(60)]
+ public string Info13 { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs
new file mode 100644
index 0000000..d5d5455
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs
@@ -0,0 +1,82 @@
+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 mes_package_linequeue
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ public int? AreaCode { get; set; }
+
+ public int UpiStatus { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
+ [StringLength(60)]
+ public string Info4 { get; set; }
+
+ [StringLength(60)]
+ public string Info6 { get; set; }
+
+ [StringLength(60)]
+ public string Info7 { get; set; }
+
+ [StringLength(60)]
+ public string Info8 { get; set; }
+
+ [StringLength(60)]
+ public string Info10 { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
+
+ [StringLength(60)]
+ public string Info11 { get; set; }
+
+ [StringLength(60)]
+ public string Info12 { get; set; }
+
+ [StringLength(60)]
+ public string Info13 { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs
new file mode 100644
index 0000000..4188c52
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs
@@ -0,0 +1,81 @@
+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 mes_package_unline_record
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PackageCode { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
+ [StringLength(60)]
+ public string Info4 { get; set; }
+
+ [StringLength(60)]
+ public string Info6 { get; set; }
+
+ [StringLength(60)]
+ public string Info7 { get; set; }
+
+ [StringLength(60)]
+ public string Info8 { get; set; }
+
+ [StringLength(60)]
+ public string Info10 { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
+
+ [StringLength(60)]
+ public string Info11 { get; set; }
+
+ [StringLength(60)]
+ public string Info12 { get; set; }
+
+ [StringLength(60)]
+ public string Info13 { get; set; }
+
+ [StringLength(60)]
+ public string OpRemark { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs
similarity index 92%
rename from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
rename to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs
index b1d6e3e..9ac912f 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs
@@ -6,7 +6,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.Spatial;
- public partial class mes_PushPackageCode
+ public partial class mes_push_packagecode
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public long Id { get; set; }
@@ -17,6 +17,8 @@
public int PushStatus { get; set; }
+ public DateTime? PushTime { get; set; }
+
public int PushNum { get; set; }
[Required]
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs
similarity index 83%
copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs
index b1d6e3e..eb45ef9 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -6,7 +6,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.Spatial;
- public partial class mes_PushPackageCode
+ public partial class mes_push_papercut
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public long Id { get; set; }
@@ -15,8 +15,16 @@
[StringLength(50)]
public string PackageCode { get; set; }
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
+
public int PushStatus { get; set; }
+ public DateTime? PushTime { get; set; }
+
public int PushNum { get; set; }
[Required]
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj
index 91fcf42..0b1ca27 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj
@@ -264,7 +264,11 @@
<Compile Include="WmsDBModel\GoViewPro.cs" />
<Compile Include="WmsDBModel\GoViewProData.cs" />
<Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" />
- <Compile Include="WmsDBModel\mes_PushPackageCode.cs" />
+ <Compile Include="WmsDBModel\mes_package_gather.cs" />
+ <Compile Include="WmsDBModel\mes_package_linequeue.cs" />
+ <Compile Include="WmsDBModel\mes_package_unline_record.cs" />
+ <Compile Include="WmsDBModel\mes_push_packagecode.cs" />
+ <Compile Include="WmsDBModel\mes_push_papercut.cs" />
<Compile Include="WmsDBModel\SysCodeGen.cs" />
<Compile Include="WmsDBModel\SysCodeGenConfig.cs" />
<Compile Include="WmsDBModel\SysConfig.cs" />
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
index 545e3e5..e0977a0 100644
--- "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
Binary files differ
diff --git a/LA24030_LuLiPackageLine_Web/index.html b/LA24030_LuLiPackageLine_Web/index.html
index 8742a83..2851225 100644
--- a/LA24030_LuLiPackageLine_Web/index.html
+++ b/LA24030_LuLiPackageLine_Web/index.html
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css" media="print" href="/print-lock.css" />
<link rel="icon" href="/favicon.ico" />
- <title>鏍囧噯鍖栧師鏉愭枡搴�</title>
+ <title>椴佷附鏈ㄤ笟鍖呰绾�</title>
</head>
<body>
<div id="app"></div>
--
Gitblit v1.9.3