From b183905d45e279eca8a845f532fc2d2edd540edb Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 10 七月 2025 17:27:42 +0800
Subject: [PATCH] 重构盘点单表结构，修复部分盘点逻辑
---
api/ApiModel.cs | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index ae045d0..c6eb912 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -40,7 +40,7 @@
}
public class SafetyInteractionInfo {
- public int station_id { get; set; }
+ //public int station_id { get; set; }
/// <summary>
/// 璇锋眰涓婄嚎/涓嬬嚎鐨勭殑绔欏彴搴撲綅鍚嶇О锛屼緥濡倃ork6銆亀ork8
@@ -51,10 +51,11 @@
/// 璇锋眰鐮� /// </summary>
public string apply_code { get; set; }
- public string task_no { set; get; }
+ //public string task_no { set; get; }
}
public class orderStatusReportParme {
+ public int id { get; set; }
/// <summary>
/// 璁㈠崟ID
/// </summary>
@@ -88,17 +89,6 @@
/// 閿欒鐮� /// </summary>
public int errorCode { get; set; }
-
- /// <summary>
- /// 璁㈠崟鐨勬埅鑷虫椂闂�- /// </summary>
- public string deadLine { get; set; }
-
- /// <summary>
- /// 璁㈠崟鐨勫垱寤烘椂闂�- /// </summary>
- public string createdTime { get; set; }
-
/// <summary>
/// 棰濆淇℃伅1
/// </summary>
@@ -108,6 +98,24 @@
/// 棰濆淇℃伅2
/// </summary>
public string extraInfo2 { get; set; }
+ /// <summary>
+ /// 璁㈠崟鐨勬埅鑷虫椂闂�+ /// </summary>
+ public string deadLine { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鐨勫垱寤烘椂闂�+ /// </summary>
+ public string createdTime { get; set; }
+ /// <summary>
+ /// 鍒涘缓鐢ㄦ埛
+ /// </summary>
+ public string createUser { get; set; }
+
+ /// <summary>
+ /// 鐘舵�鏇存敼鏃堕棿
+ /// </summary>
+ public string statusChangeTime { get; set; }
}
/// <summary>
@@ -116,6 +124,11 @@
public class ReturnResult {
public int ResultCode { get; set; }
public string ResultMsg { get; set; }
+ }
+
+ public class gzResult {
+ public int code { get; set; } = 0;
+ public string msg { get; set; } = "success";
}
/// <summary>
@@ -143,13 +156,32 @@
public string Row { get; set; }
}
+ public class InboundDataInfo {
+ /// <summary>
+ /// 璧风偣璐т綅
+ /// </summary>
+ [JsonProperty("StartLoc")]
+ public string StartLoc { get; set; }
+
+ /// <summary>
+ /// 缁堢偣璐ф灦锛堝彲閫夛級
+ /// </summary>
+ [JsonProperty("Nrow")]
+ public string Row { get; set; }
+
+ public string ItemCode { get; set; }
+ //public string ItemName { get; set; }
+ }
+
public class SelectLocationInfo {
/// <summary>
/// AGV灏忚溅鍙凤細NOTE 鍚庢湡鍙兘鐪佺暐锛屽洜涓哄彧鏈変竴杈嗚溅
/// </summary>
- public string forklift_no { get; set; }
+ //public string forklift_no { get; set; }
- public string endLoc { get; set; }
+ public string TaskNo { get; set; }
+
+ public string EndLoc { get; set; }
}
/// <summary>
@@ -165,6 +197,10 @@
/// 缁堢偣浣嶇疆
/// </summary>
public string endLoc { get; set; }
+ }
+
+ public class CancelTaskInfo {
+ public string TaskNo { get; set; }
}
/// <summary>
@@ -192,7 +228,8 @@
}
public class CountProductInfo {
- public string cntrCode { get; set; }
+ //public string cntrCode { get; set; }
+ public string locCode { get; set; }
public float qty { get; set; }
}
--
Gitblit v1.9.1