From a017f6a3f5b24637b99a38dbc0855785c6a2ebff Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期一, 20 四月 2026 11:01:32 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs"
index 7059cf7..04ff3ef 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs"
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -110,6 +111,8 @@
public string warehouseCode { get; set; }
+ public string remark { get; set; }
+
public List<BarcodesModel> barcodes { get; set; }
}
@@ -125,9 +128,11 @@
public string business_type { get; set; }
- public bool isBatch { get; set; }
+ public int isBatch { get; set; }
public string factoryArea { get; set; }
+
+ public int isTestMaterials { get; set; }
public List<InBoundDetailsModel> details { get; set; }
@@ -155,6 +160,9 @@
public int operationType { get; set; }
+ [JsonProperty("operator")]
+ public string Operator { get; set; }
+
/// <summary>
///
/// </summary>
@@ -165,7 +173,6 @@
public int status { get; set; }
public string factoryArea { get; set; }
-
public List<FeedbackInboundDetailsModel> details { get; set; }
}
--
Gitblit v1.9.3