From 806b3cb3448ad15a5d563937fdac2ffae37342a7 Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期三, 23 四月 2025 22:11:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Model.Net/Entitys/WMS/Api/Output_Entitys.cs | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/Api/Output_Entitys.cs b/Tiger.Model.Net/Entitys/WMS/Api/Output_Entitys.cs
index 27566f0..0348fd0 100644
--- a/Tiger.Model.Net/Entitys/WMS/Api/Output_Entitys.cs
+++ b/Tiger.Model.Net/Entitys/WMS/Api/Output_Entitys.cs
@@ -4,10 +4,49 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.Minsun;
namespace Tiger.Model
{
+ public class ScanOutput<T>
+ {
+ /// <summary>
+ /// 鎿嶄綔鎸囦护
+ /// </summary>
+ public string Command { get; set; }
+ /// <summary>
+ /// Mqtt娑堟伅
+ /// </summary>
+ public MQTT.Message MqttMsg { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔杩斿洖鐨勬暟鎹�
+ /// </summary>
+ public T Data { get; set; }
+ }
+
+ public class ScanOutput : ScanOutput<object>
+ {
+
+ }
+
+ public class ScanShelfInfo
+ {
+ public string WarehouseCode { get; set; }
+ public string RegionCode { get; set; }
+ public string ShelfCode { get; set; }
+ public string LocationCode { get; set; }
+ public string RackCode => ShelfCode;
+ public bool IsSmartRack { get; set; }
+ public double Capacity { get; set; }
+ public int LotCount { get; set; }
+ public double MaxSize { get; set; }
+ public int ShelfType { get; set; }
+ public bool IsScanShelf { get; set; }
+ public WMS_SHELF Shelf { get; set; }
+ public WMS_LOCATION Location { get; set; }
+ }
+
public class DefaultScanItemOutput
{
public int ReqType { get; set; }
@@ -17,14 +56,13 @@
public string SN { get; set; }
public string ItemCode { get; set; }
public string MaterialName { get; set; }
- public decimal Qty { get; set; }
- public decimal CutQty { get; set; }
+ public double Qty { get; set; }
+ public double CutQty { get; set; }
public string regionCode { get; set; }
public string locationCode { get; set; }
public string ScanAfCut { get; set; }
public string Unit { get; set; }
public DateTime DateCode { get; set; }
- public string Message { get; set; }
}
public class DefaultInStoreOutput
@@ -32,12 +70,13 @@
public string Barcode { get; set; }
public string MaterialCode { get; set; }
public string MaterialName { get; set; }
- public decimal CurrentQty { get; set; }
+ public double CurrentQty { get; set; }
public string Unit { get; set; }
public DateTime DateCode { get; set; }
public string WarehouseCode { get; set; }
public string RegionCode { get; set; }
public string ShelfCode { get; set; }
public string LocationCode { get; set; }
+ public object OrderInfo { get; set; }
}
}
--
Gitblit v1.9.3