From 55142f3214485c7ec12c5e414a56519f66a1eb1d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 十月 2025 19:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs"
index 6912a2e..3a68533 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs"
@@ -14,7 +14,7 @@
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [SugarColumn(ColumnName = "DeliveryOrderId", IsNullable = true, ColumnDescription = "鍏宠仈鍏ュ簱鍗旾D")]
+ [SugarColumn(ColumnName = "DeliveryOrderId", IsNullable = true, ColumnDescription = "鍏宠仈鍑哄簱鍗旾D")]
public int DeliveryOrderId { get; set; }
//鍖哄煙锛堣嚜宸卞缓绔嬫垨鑰呬粬浠洿鎺ョ粰鍑烘潵锛�
@@ -27,6 +27,9 @@
[SugarColumn(ColumnName = "Order_qty", IsNullable = true, ColumnDescription = "鍑哄簱閫�璐ф椂涓鸿礋鏁�")]
public decimal Order_qty { get; set; }
+
+ [SugarColumn(ColumnName = "Order_Outqty", IsNullable = true, ColumnDescription = "鍑哄簱瀹屾垚鏁伴噺")]
+ public decimal Order_Outqty { get; set; }
[SugarColumn(ColumnName = "Batch_num", IsNullable = true, Length = 50, ColumnDescription = "鎵瑰彿")]
public string Batch_num { get; set; }
@@ -47,8 +50,9 @@
public int Status { get; set; }
// 瀵艰埅灞炴�э細涓�涓槑缁嗗搴斾竴涓嵂鍝佷俊鎭�
- [Navigate(NavigateType.OneToOne, nameof(Goods_no), nameof(Dt_MedicineGoods.Goods_no))]
- public Dt_MedicineGoods MedicineGoods { get; set; }
+ // 淇瀵艰埅灞炴�э細浣跨敤 Goods_no 鍏宠仈 MaterielCode
+ [Navigate(NavigateType.OneToOne, nameof(Goods_no), nameof(Dt_MaterielInfo.MaterielCode))]
+ public Dt_MaterielInfo MedicineGoods { get; set; }
//鏄惁闇�瑕佷笅闈㈢殑瀛楁
//sku鍚嶇О productName
--
Gitblit v1.9.3