From 62d49f6df86a43aadaf5b5fab89e3ac8ee8c0727 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 23 六月 2025 11:37:37 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/wms/WMSModel.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/wms/WMSModel.cs b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
index ecec452..93142fd 100644
--- a/HH.WCS.QingXiNongfu/wms/WMSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
@@ -2,10 +2,6 @@
using HH.WCS.QingXigongchang.util;
using SqlSugar;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace HH.WCS.QingXigongchang.wms
{
@@ -73,6 +69,7 @@
public int N_LAYER { get; internal set; }
public string S_ITEM_CODE { get; internal set; }
public string S_ITEM_NAME { get; internal set; }
+ public string S_CJ_NAME { get; set; }
}
@@ -215,6 +212,11 @@
/// 鍗婃墭1 0.5 鍗婃墭2銆�0.75 婊℃墭 1
/// </summary>
public double N_BQ_TRAY_TYPE { get; set; } = 1;
+
+ /// <summary>
+ /// 鍘傚
+ /// </summary>
+ public string S_CJ_NAME { get; set; }
public int ItemLayer { get; set; }
[SugarColumn(IsIgnore = true)]
@@ -363,6 +365,18 @@
public string S_CNTR_STATE { get; set; }
}
+ [SuGG("搴撳琛�)]
+ public class KuRong : BaseModel
+ {
+ public string StorageLoc { get; set; }
+ public int MaxCapacity { get; set; }
+ public int FilledCapacity { get; set; }
+ public string ProductItem { get; set; }
+ public int AvailableCapacity { get; set; }
+ public int DesiredCapacity { get; set; }
+ public int CRC { get; set; }
+ public int RAC { get; set; }
+ }
//鍧囧窞鐜板満
//[SugarTable("dbo.")]
@@ -378,6 +392,7 @@
public string S_END_LAREA { get; set; }
public string S_START_LOC { get; set; }
public string S_END_LOC { get; set; }
+ public string S_TWO_END_LOC { get; set; }
public string S_TYPE { get; set; }
public string S_NOTE { get; set; }
public string S_SRC_SYS { get; set; }
--
Gitblit v1.9.1