From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序,ERP代码,MES代码等

---
 项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index b4cc9c5..c63c923 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -64,6 +64,7 @@
             try
             {
                 var barcode = saveModel.MainData["palletCode"].ToString();
+                var fridcode = saveModel.MainData["fridCode"].ToString();
                 var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
                 var materSn = saveModel.MainData["materSn"];
                 //鐩村緞
@@ -71,22 +72,26 @@
                 var weight = saveModel.MainData["weight"].ObjToInt();
                 //骞呭
                 var wide = saveModel.MainData["wide"].ObjToInt();
+                var lengthStock = saveModel.MainData["lengthStock"].ObjToInt();
                 Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materSn);
                 if (materielInfo==null)
                 {
                     return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
                 }
-                Dt_StockInfo stockInfoOld = BaseDal.QueryFirst(x=>x.PalletCode== barcode);
+
+                Dt_StockInfo stockInfoOld = BaseDal.QueryFirst(x=>x.PalletCode== barcode || x.RfidCode== fridcode);
+
                 if (stockInfoOld != null)
                 {
-                    return content.Error("鎵樼洏淇℃伅宸插瓨鍦�");
+                    return content.Error("鏉$爜淇℃伅鎴朢FID淇℃伅宸插瓨鍦�");
                 }
                 //鐢熸垚搴撳瓨缁勭洏淇℃伅
                 Dt_StockInfo stockInfo = new Dt_StockInfo()
                 {
                     MaterielInvOrgId=materielInfo.MaterielInvOrgId,
                     PalletCode= barcode,
-                    LocationCode="",
+                    RfidCode= fridcode,
+                    LocationCode ="",
                     PalletType = 1,
                     WarehouseId=warehouseId,
                     StockAttribute= materielInfo.MaterielSourceType,
@@ -95,6 +100,7 @@
                     Unit=materielInfo.MaterielUnit,
                     MaterielThickness=thickness,
                     MaterielWide=wide,
+                    StockLength=lengthStock,
                     MaterielWeight=weight,
                     MaterielCode = materielInfo.MaterielCode,
                     MaterielName=materielInfo.MaterielName,
@@ -120,6 +126,12 @@
 
             return BaseDal.GetStockInfos(materielId,width, locationCodes);
         }
+        public List<Dt_StockInfo> GetUseableStocks(string materielCode, decimal width, int warehoseId)
+        {
+            List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
+
+            return BaseDal.GetStockInfos(materielCode, width, locationCodes);
+        }
 
         /// <summary>
         /// 鍒嗛厤瀹為檯搴撳瓨

--
Gitblit v1.9.3