From 6f89acbf74c6838db518a9f2b6c83f0ab0d97e7f Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期二, 29 七月 2025 18:13:31 +0800
Subject: [PATCH] 余料回库流程增加绑定和解绑，RFID校验必须校验开头
---
api/ApiModel.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 9c49c92..5b3e50f 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -431,18 +431,27 @@
{
public string old_CntId { get; set; }//鏃у鍣↖D锛岃鎷嗙殑
public string old_StartLoc { get; set; }//鏃у鍣ㄧ殑璧风偣
-
/// <summary>
- /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍚堟牸锛�娣峰悎锛�涓�骇鏂欍�7浜岀骇鏂�+ /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍒ゅ畾锛�娣峰悎锛�E绾ф枡銆�浜岀骇鏂欍�8鍥炵倝鑳躲�9搴熸枡
/// </summary>
public int old_IsOK { get; set; }//鏃у鍣↖D锛屾棫瀹瑰櫒鐨勮揣鍝佺殑
+
+ public string old_Spec { get; set; }//鏃у鍣ㄧ殑璐у搧鐨勮鏍�+
+ public string old_CarCode { get; set; }//鏃у鍣ㄧ殑璐у搧鐨勮溅鍙�+
public string new_CntIds { get; set; }//鎷嗗悗鐨勬柊瀹瑰櫒ID
public string new_StartLoc { get; set; }//鏂板鍣↖D璧风偣
/// <summary>
- /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍚堟牸锛�娣峰悎锛�涓�骇鏂欍�7浜岀骇鏂�+ /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍒ゅ畾锛�娣峰悎锛�E绾ф枡銆�浜岀骇鏂欍�8鍥炵倝鑳躲�9搴熸枡
/// </summary>
public int new_IsOK { get; set; }//鏂板鍣↖D鐨勮揣鍝佺殑
+
+ public string new_Spec { get; set; }//鏂板鍣ㄧ殑璐у搧鐨勮鏍�+
+ public string new_CarCode { get; set; }//鏂板鍣ㄧ殑璐у搧鐨勮溅鍙�+
public string staff { get; set; } = "None";//鎿嶄綔浜� public string shift { get; set; } = "None";//鐝
}
@@ -460,9 +469,41 @@
{
public string startLoc { get; set; }//璧风偣
public string endLoc { get; set; }//缁堢偣
- public int priority { get; set; }//浼樺厛绾�+ public int priority { get; set; } = 3;//浼樺厛绾� public string staff { get; set; } = "None";//鎿嶄綔浜� public string shift { get; set; } = "None";//鐝
}
+
+ public class EmptyLineToLineInfo
+ {
+ public string startLoc { get; set; }//璧风偣
+
+ public string staff { get; set; } = "None";//鎿嶄綔浜�+ }
+
+ public class EmptyLineToEmptyMaxInfo
+ {
+ public string startLoc { get; set; }//璧风偣
+ public int cntCount { get; set; }//瀹瑰櫒鏁伴噺
+ public string staff { get; set; } = "None";//鎿嶄綔浜�+ }
+
+ public class SurplusBindInfo
+ {
+ public string loc { get; set; }//璐т綅鐐�+
+ public string spec { get; set; }//瑙勬牸
+
+ public float weight { get; set; }//閲嶉噺
+ }
+
+ public class SurplusUnBindInfo
+ {
+ public string loc { get; set; }//璐т綅鐐�+
+ public string spec { get; set; }//瑙勬牸
+
+ public float weight { get; set; }//閲嶉噺
+ }
}
}
--
Gitblit v1.9.1