diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj index 247c052..76f83fa 100644 --- a/B3ClientService/B3ClientService.csproj +++ b/B3ClientService/B3ClientService.csproj @@ -132,7 +132,7 @@ - + @@ -246,6 +246,7 @@ + diff --git a/B3ClientService/BO/Bill/CarcassFullInfo.cs b/B3ClientService/BO/Bill/CarcassFullInfo.cs index 9d9ea65..809c4b3 100644 --- a/B3ClientService/BO/Bill/CarcassFullInfo.cs +++ b/B3ClientService/BO/Bill/CarcassFullInfo.cs @@ -50,9 +50,13 @@ namespace BWP.B3ClientService.BO [LogicName("胴体重量")] public decimal? GradeWeight { get; set; } - [LogicName("定级生产批次")] + [LogicName("定级生产批次")] public long? GradeProductBatch_ID { get; set; } + [ReferenceTo(typeof(ProductBatch), "Name")] + [Join("GradeProductBatch_ID", "ID")] + public string GradeProductBatch_Name { get; set; } + #endregion #region 入库信息 @@ -96,7 +100,7 @@ namespace BWP.B3ClientService.BO public long? SaleGoods_ID { get; set; } [LogicName("领用重量")] - public decimal? PickWeight { get; set; } + public decimal? PickWeight { get; set; } [LogicName("领用组标识")] public long? PickGroupID { get; set; } diff --git a/B3ClientService/BO/Bill/CarcassInventory.cs b/B3ClientService/BO/Bill/CarcassInventoryTemp.cs similarity index 74% rename from B3ClientService/BO/Bill/CarcassInventory.cs rename to B3ClientService/BO/Bill/CarcassInventoryTemp.cs index 62fc7e5..08c840f 100644 --- a/B3ClientService/BO/Bill/CarcassInventory.cs +++ b/B3ClientService/BO/Bill/CarcassInventoryTemp.cs @@ -6,8 +6,10 @@ using System.Text; namespace BWP.B3ClientService.BO { - public class CarcassInventory : Base + public class CarcassInventoryTemp : Base { + public long Worker_ID { get; set; } + public DateTime Date { get; set; } public string BarCode { get; set; } diff --git a/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs b/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs index e427cfb..53c58a4 100644 --- a/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs +++ b/B3ClientService/OfflinRpc/CarcassInventoryRpc.cs @@ -22,7 +22,7 @@ namespace BWP.B3ClientService.Rpcs } [Rpc(RpcFlags.SkipAuth)] - public static int InsertInventoryInfo(List list) + public static int InsertInventoryInfo(List list) { using (var session = Dmo.NewSession()) { @@ -31,5 +31,12 @@ namespace BWP.B3ClientService.Rpcs } return list.Count; } + + [Rpc(RpcFlags.SkipAuth)] + public static int FinishInventory() + { + + return 1; + } } }