From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
index a23dddc..ffe4d07 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
@@ -58,7 +58,7 @@
public string order_no { get; set; }
/// <summary>
- /// 鍏ュ簱鍗曠被鍨嬶紙1锛氭甯稿叆搴擄紱3锛氬叆搴撻��璐э級
+ /// 鍏ュ簱鍗曠被鍨嬶紙1锛氭甯稿叆搴擄紱3锛氬叆搴撻��璐�,5:鐩樼泩鍏ュ簱锛�
/// </summary>
public string order_type { get; set; }
@@ -180,7 +180,8 @@
{
public string goods_no { get; set; }
- public string materialCode { get; set; }
+ //涓婃父鐗╂枡绫诲瀷
+ public string goods_type { get; set; }
/// <summary>
/// 閫氱敤鍚�
/// </summary>
@@ -188,6 +189,8 @@
public string goods_spm { get; set; }
public string model { get; set; }
public string factory { get; set; }
+ public string dosage_form { get; set; }//鑽墏
+ public string barcode { get; set; }//鏉＄爜
public string unit { get; set; }
public decimal? item_length { get; set; }
public decimal? item_width { get; set; }
@@ -306,13 +309,11 @@
/// </summary>
public string batch_num { get; set; }
/// <summary>
- /// 搴撳瓨鏁伴噺
+ /// 搴撳瓨鏁伴噺(涓氬姟鏁伴噺)
/// </summary>
public decimal business_qty { get; set; }
/// <summary>
- /// 鍙敤搴撳瓨锛堝疄闄呭簱瀛樻暟閲忥級
- /// </summary>
- public decimal actural_qty { get; set; }
+
/// <summary>
/// 鏁堟湡
/// </summary>
--
Gitblit v1.9.3