From b2b779905bc8a71b52d0e14f91652309d9279878 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 03 二月 2026 14:37:38 +0800
Subject: [PATCH] 一堆逻辑修改
---
项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 15 ++++++++++++---
1 files changed, 12 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 47834ae..444f52a 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"
@@ -117,7 +117,7 @@
MaterielCode = materielInfo.MaterielCode,
MaterielName=materielInfo.MaterielName,
};
- if (wide>1200)
+ if (wide>=1160)
{
stockInfo.PalletType = 2;
}
@@ -155,7 +155,8 @@
BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(item.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
if (bSTResponse.Code == 500)
{
- throw new Exception($"鏈壘鍒版潯鐮亄item.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�");
+ content.Message += $"鏉＄爜{item.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�,";
+ continue;
}
BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧item.PalletCode}鐨勫簱瀛樹俊鎭�");
if (item.StockLength != bSTStockInfoDTO.StockMeter && bSTStockInfoDTO.StockMeter>0)
@@ -180,7 +181,7 @@
BaseDal.DeleteAndMoveIntoHty(stockInfosDel, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
}
_unitOfWorkManage.CommitTran();
- content.OK("鏇存柊鎴愬姛");
+ content.OK();
}
catch (Exception ex)
{
@@ -205,6 +206,14 @@
return BaseDal.GetStockInfos(materielCode, width, locationCodes);
}
+ /// <summary>
+ /// 鑾峰彇鑰佸巶缂撳瓨鍙敤搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ public List<Dt_StockInfo> GetUseOldCacheStocks(string materielCode, decimal width)
+ {
+ return Db.Queryable<Dt_StockInfo>().Where(x => x.MaterielCode.StartsWith(materielCode) && x.StockStatus == StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt() && x.MaterielWide == width && x.StockOutLength <= 0 && x.StockLength > 0).OrderBy(x => x.CreateDate).ToList();
+ }
public List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId)
{
List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
--
Gitblit v1.9.3