From e354b5938f49ac90b237289923dcde923d22daf5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 20 十一月 2025 09:08:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs |  344 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 306 insertions(+), 38 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs"
index ddc6e54..b0b9bab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs"
@@ -1,4 +1,7 @@
-锘縰sing System;
+锘縰sing Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -7,7 +10,9 @@
 using WIDESEA_Core;
 using WIDESEA_Core.BaseRepository;
 using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.Basic;
 using WIDESEA_DTO.Outbound;
+using WIDESEA_IBasicService;
 using WIDESEA_IOutboundService;
 using WIDESEA_IStockService;
 using WIDESEA_Model.Models;
@@ -22,105 +27,162 @@
         private readonly IStockInfoService _stockInfoService;
         private readonly IStockInfoDetailService _stockInfoDetailService;
         private readonly IOutStockLockInfoService _outStockLockInfoService;
+        private readonly IDailySequenceService _dailySequenceService;
+        private readonly IInvokeMESService _invokeMESService;
 
-        public SplitPackageService(IRepository<Dt_SplitPackageRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService) : base(BaseDal)
+        private readonly ILogger<SplitPackageService> _logger;
+        public SplitPackageService(IRepository<Dt_SplitPackageRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, IDailySequenceService dailySequenceService, IInvokeMESService invokeMESService, ILogger<SplitPackageService> logger) : base(BaseDal)
         {
             _unitOfWorkManage = unitOfWorkManage;
             _stockInfoService = stockInfoService;
             _outStockLockInfoService = outStockLockInfoService;
             _stockInfoDetailService = stockInfoDetailService;
+            _dailySequenceService = dailySequenceService;
+            _invokeMESService = invokeMESService;
+            _logger = logger;
         }
 
         /// <summary>
         /// 鎷嗗寘鎷嗙鎿嶄綔
         /// </summary>
-        public async Task<WebResponseContent> SplitPackage(SplitPackageRequest request)
+        public async Task<WebResponseContent> SplitPackage(SplitPackageDto request)
         {
             try
             {
                 _unitOfWorkManage.BeginTran();
 
                 // 1. 楠岃瘉鍑哄簱閿佸畾淇℃伅
-                var lockInfo = await Db.Queryable<Dt_OutStockLockInfo>()
-                    .Where(x => x.Id == request.OutStockLockInfoId &&
-                               x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+                var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+                          .Where(x => x.OrderNo == request.OrderNo &&
+                           x.PalletCode == request.PalletCode &&
+                           x.CurrentBarcode == request.OriginalBarcode &&
+                           x.Status == 1)
                     .FirstAsync();
 
                 if (lockInfo == null)
                     return WebResponseContent.Instance.Error("鏈壘鍒版湁鏁堢殑鍑哄簱閿佸畾淇℃伅");
 
-                //// 2. 楠岃瘉褰撳墠鏉$爜鐨勫彲鐢ㄦ暟閲�
-                //var currentStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
-                //    .Where(x => x.Barcode == lockInfo.CurrentBarcode &&
-                //               x.MaterielCode == request.MaterielCode &&
-                //               x.StockId == lockInfo.StockId)
-                //    .FirstAsync();
-
-                //if (currentStockDetail == null)
-                //    return WebResponseContent.Instance.Error("褰撳墠鏉$爜鍦ㄥ簱瀛樹腑涓嶅瓨鍦�");
-
-                //// 3. 妫�鏌ュ彲鐢ㄦ暟閲�
-                //decimal availableQuantity = currentStockDetail.StockQuantity - currentStockDetail.OutboundQuantity;
-                //if (request.SplitQuantity > availableQuantity)
-                //    return WebResponseContent.Instance.Error($"鎷嗗寘鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺锛屽彲鐢ㄦ暟閲忥細{availableQuantity}");
-
                 // 2. 妫�鏌ュ墿浣欓攣瀹氭暟閲�
-                decimal remainingLockQuantity = lockInfo.AssignQuantity - lockInfo.PickedQty;
+                decimal remainingLockQuantity = lockInfo.OriginalQuantity - lockInfo.PickedQty;
                 if (request.SplitQuantity > remainingLockQuantity)
                     return WebResponseContent.Instance.Error($"鎷嗗寘鏁伴噺涓嶈兘澶т簬鍓╀綑閿佸畾鏁伴噺锛屽墿浣欙細{remainingLockQuantity}");
 
+                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+               .Where(x => x.Barcode == request.OriginalBarcode && x.StockId == lockInfo.StockId)
+               .FirstAsync();
+                if (stockDetail == null)
+                    throw new Exception($"鏈壘鍒版潯鐮亄request.OriginalBarcode}瀵瑰簲鐨勫簱瀛樿褰�");
+
+                stockDetail.StockQuantity = request.SplitQuantity;
+                stockDetail.OutboundQuantity = request.SplitQuantity;
+                _stockInfoDetailService.Db.Updateable<Dt_StockInfoDetail>(stockDetail).ExecuteCommand();
+
+
+                var seq = await _dailySequenceService.GetNextSequenceAsync();
                 // 3. 鐢熸垚鏂版潯鐮�
-                string newBarcode = "";
+                string newBarcode = "WSLOT" + DateTime.Now.ToString("yyyyMMdd") + seq.ToString()?.PadLeft(5, '0');
+
+                decimal remainingQty = remainingLockQuantity - request.SplitQuantity;
+
+                // 涓烘媶鍖呬骇鐢熺殑鏂版潯鐮佸垱寤哄簱瀛樿褰�
+                var newStockDetail = new Dt_StockInfoDetail
+                {
+                    SupplyCode = stockDetail.SupplyCode,
+                    WarehouseCode = stockDetail.WarehouseCode,
+                    BarcodeQty = stockDetail.BarcodeQty,
+                    BarcodeUnit = stockDetail.BarcodeUnit,
+                    BusinessType = stockDetail.BusinessType,
+                    Unit = stockDetail.Unit,
+                    StockId = lockInfo.StockId,
+                    MaterielCode = stockDetail.MaterielCode,
+                    OrderNo = stockDetail.OrderNo,
+                    BatchNo = stockDetail.BatchNo,
+                    StockQuantity = remainingQty,
+                    OutboundQuantity = remainingQty, // 閿佸畾鍏ㄩ儴鏁伴噺
+                    Barcode = newBarcode,
+                    InboundOrderRowNo = stockDetail.InboundOrderRowNo,
+
+                };
+                await _outStockLockInfoService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
 
                 // 4. 鍒涘缓鏂扮殑鍑哄簱閿佸畾淇℃伅锛堟柊鏉$爜锛�
                 var newLockInfo = new Dt_OutStockLockInfo
                 {
+
                     OrderNo = lockInfo.OrderNo,
                     OrderDetailId = lockInfo.OrderDetailId,
                     BatchNo = lockInfo.BatchNo,
                     MaterielCode = lockInfo.MaterielCode,
                     MaterielName = lockInfo.MaterielName,
                     StockId = lockInfo.StockId,
-                    OrderQuantity = lockInfo.OrderQuantity,
-                    OriginalQuantity = lockInfo.OriginalQuantity,
-                    AssignQuantity = request.SplitQuantity, // 鏂版潯鐮佸垎閰嶆暟閲�
+                    OrderQuantity = remainingQty,
+                    OriginalQuantity = remainingQty,
+                    AssignQuantity = remainingQty, // 鏂版潯鐮佸垎閰嶆暟閲�
                     PickedQty = 0, // 鏂版潯鐮佹湭鎷i��
                     LocationCode = lockInfo.LocationCode,
                     PalletCode = lockInfo.PalletCode,
                     TaskNum = lockInfo.TaskNum,
                     Status = (int)OutLockStockStatusEnum.鍑哄簱涓�,
                     Unit = lockInfo.Unit,
-                
+                    SupplyCode = lockInfo.SupplyCode,
+                    OrderType = lockInfo.OrderType,
                     CurrentBarcode = newBarcode, // 鏂版潯鐮�
                     OriginalLockQuantity = request.SplitQuantity,
                     IsSplitted = 1,
                     ParentLockId = lockInfo.Id // 璁板綍鐖剁骇閿佸畾ID
                 };
-                await Db.Insertable(newLockInfo).ExecuteCommandAsync();
+                await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
 
                 // 5. 鏇存柊鍘熼攣瀹氫俊鎭殑鍒嗛厤鏁伴噺锛堝噺灏戞媶鍖呮暟閲忥級
-                lockInfo.AssignQuantity -= request.SplitQuantity;
-                await Db.Updateable(lockInfo).ExecuteCommandAsync();
+                lockInfo.AssignQuantity = request.SplitQuantity;
+                await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
 
                 // 6. 璁板綍鎷嗗寘鍘嗗彶锛堢敤浜庤拷韪級
                 var splitHistory = new Dt_SplitPackageRecord
                 {
+                    FactoryArea = lockInfo.FactoryArea,
+                    TaskNum = lockInfo.TaskNum,
                     OutStockLockInfoId = lockInfo.Id,
+                    StockId = stockDetail?.StockId ?? 0,
+                    Operator = App.User.UserName,
+                    IsReverted = false,
                     OriginalBarcode = lockInfo.CurrentBarcode,
                     NewBarcode = newBarcode,
                     SplitQty = request.SplitQuantity,
-                    MaterielCode = request.MaterielCode,
+                    RemainQuantity = lockInfo.OriginalQuantity - request.SplitQuantity,
+                    MaterielCode = lockInfo.MaterielCode,
                     SplitTime = DateTime.Now,
-                    Operator = request.Operator,
+                    OrderNo = request.OrderNo,
+                    PalletCode = request.PalletCode,
                     Status = (int)SplitPackageStatusEnum.宸叉媶鍖�
                 };
                 await Db.Insertable(splitHistory).ExecuteCommandAsync();
 
-                Db.Ado.CommitTran();
-
-                // 7. 鍥炰紶鏂版潯鐮佺粰MES
-               // await SendBarcodeToMES(newBarcode, request.MaterielCode, request.SplitQuantity);
-
+                _unitOfWorkManage.CommitTran();
+                              
+                try
+                {
+                    MaterielToMesDTO dto = new MaterielToMesDTO
+                    {
+                        batchNo = stockDetail.BatchNo,
+                        factoryArea = stockDetail.FactoryArea,
+                        materialCode = stockDetail.MaterielCode,
+                        newmaterialCode = newBarcode,
+                        oldmaterialCode = request.OriginalBarcode,
+                        operationType = 1,
+                        qty = remainingQty,
+                        supplyCode = stockDetail.SupplyCode,
+                        unit = stockDetail.BarcodeUnit,
+                        warehouseCode = stockDetail.WarehouseCode,
+                        reqCode = Guid.NewGuid().ToString(),
+                        reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                    };
+                    _invokeMESService.NewMaterielToMes(dto);
+                }
+                catch(Exception ex)
+                {
+                    _logger.LogError("SplitPackage 鍥炰紶MES:  " + ex.Message);
+                }
                 return WebResponseContent.Instance.OK("鎷嗗寘鎴愬姛", new
                 {
                     NewBarcode = newBarcode,
@@ -129,11 +191,217 @@
             }
             catch (Exception ex)
             {
-                Db.Ado.RollbackTran();
+                _unitOfWorkManage.RollbackTran();
                 return WebResponseContent.Instance.Error($"鎷嗗寘澶辫触: {ex.Message}");
             }
         }
 
+ 
+        //public async Task<WebResponseContent> RevertSplitPackage(string originalBarcode)
+        //{
+        //    try
+        //    {
+        //        _unitOfWorkManage.BeginTran();
+
+        //        // 1. 鏌ユ壘鏈�杩戠殑鏈挙閿�鎷嗗寘璁板綍
+        //        var splitRecord = await Db.Queryable<Dt_SplitPackageRecord>()
+        //                .Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
+        //                .OrderByDescending(x => x.SplitTime)
+        //                .FirstAsync();
+
+        //        if (splitRecord == null)
+        //            return WebResponseContent.Instance.Error("鏈壘鍒板彲鎾ら攢鐨勬媶鍖呰褰�");
+
+        //        // 2. 妫�鏌ユ柊鏉$爜鏄惁宸叉嫞閫�
+        //        var newLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+        //            .Where(x => x.CurrentBarcode == splitRecord.NewBarcode)
+        //            .FirstAsync();
+
+        //        if (newLockInfo?.Status ==6) // 鍋囪鐘舵��2琛ㄧず宸叉嫞閫�
+        //            return WebResponseContent.Instance.Error("鏂版潯鐮佸凡鎷i�夛紝鏃犳硶鎾ら攢鎷嗗寘");
+
+        //        // 3. 鑾峰彇鍘熸潯鐮佺殑閿佸畾淇℃伅
+        //        var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+        //            .Where(x => x.CurrentBarcode == originalBarcode)
+        //            .FirstAsync();
+
+        //        if (originalLockInfo == null)
+        //            return WebResponseContent.Instance.Error("鏈壘鍒板師鏉$爜閿佸畾淇℃伅");
+
+          
+        //        originalLockInfo.AssignQuantity  += splitRecord.RemainQuantity;  
+        //       // originalLockInfo.Status = (int)OutLockStockStatusEnum.鍑哄簱涓�;
+        //        originalLockInfo.IsSplitted = 0; // 鏍囪涓烘湭鎷嗗寘
+        //        await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();
+
+        //        // 5. 杩樺師鍘熸潯鐮佸簱瀛樿褰�
+        //        var originalStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+        //            .Where(x => x.Barcode == originalBarcode && x.StockId == splitRecord.StockId)
+        //            .FirstAsync();
+
+        //        if (originalStockDetail != null)
+        //        {
+        //            // 灏嗘媶鍑虹殑鏁伴噺鍔犲洖鍒板師鏉$爜搴撳瓨
+        //            originalStockDetail.StockQuantity += splitRecord.RemainQuantity;
+        //            originalStockDetail.OutboundQuantity += splitRecord.RemainQuantity;
+        //            await _stockInfoDetailService.Db.Updateable(originalStockDetail).ExecuteCommandAsync();
+        //        }
+
+        //        // 6. 鍒犻櫎鏂版潯鐮佺殑閿佸畾淇℃伅
+        //        if (newLockInfo != null)
+        //        {
+        //            await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
+        //                .Where(x => x.CurrentBarcode == splitRecord.NewBarcode)
+        //                .ExecuteCommandAsync();
+        //        }
+
+        //        // 7. 鍒犻櫎鏂版潯鐮佺殑搴撳瓨璁板綍
+        //        var newStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+        //            .Where(x => x.Barcode == splitRecord.NewBarcode)
+        //            .FirstAsync();
+
+        //        if (newStockDetail != null)
+        //        {
+        //            await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
+        //                .Where(x => x.Barcode == splitRecord.NewBarcode)
+        //                .ExecuteCommandAsync();
+        //        }
+
+        //        // 8. 鏇存柊鎷嗗寘璁板綍涓哄凡鎾ら攢
+        //        splitRecord.IsReverted = true;              
+        
+        //        await Db.Updateable(splitRecord).ExecuteCommandAsync();
+
+        //        _unitOfWorkManage.CommitTran();
+
+        //        return WebResponseContent.Instance.OK($"鎾ら攢鎷嗗寘鎴愬姛锛岃繕鍘熸暟閲忥細{splitRecord.SplitQty}");
+
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        _unitOfWorkManage.RollbackTran();
+        //        return WebResponseContent.Instance.Error($"鎾ら攢鎷嗗寘澶辫触锛歿ex.Message}");
+        //    }
+        //}
+ 
+        public async Task<WebResponseContent> RevertSplitPackage(string originalBarcode)
+        {
+            try
+            {
+                _unitOfWorkManage.BeginTran();
+
+                // 1. 鏌ユ壘鎵�鏈夋湭鎾ら攢鐨勬媶鍖呰褰�
+                var splitRecords = await Db.Queryable<Dt_SplitPackageRecord>()
+                        .Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
+                        .OrderBy(x => x.SplitTime) // 鎸夋椂闂存搴忥紝浠庢渶鏃╁紑濮嬫挙閿�
+                        .ToListAsync();
+
+                if (splitRecords == null || !splitRecords.Any())
+                    return WebResponseContent.Instance.Error("鏈壘鍒板彲鎾ら攢鐨勬媶鍖呰褰�");
+
+                // 2. 妫�鏌ユ墍鏈夋柊鏉$爜鏄惁宸叉嫞閫�
+                var newBarcodes = splitRecords.Select(x => x.NewBarcode).ToList();
+                var newLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+                    .Where(x => newBarcodes.Contains(x.CurrentBarcode))
+                    .ToListAsync();
+
+                var pickedBarcodes = newLockInfos.Where(x => x.Status == 2).Select(x => x.CurrentBarcode).ToList();
+                if (pickedBarcodes.Any())
+                    return WebResponseContent.Instance.Error($"浠ヤ笅鏉$爜宸叉嫞閫夛紝鏃犳硶鎾ら攢锛歿string.Join(",", pickedBarcodes)}");
+
+                // 3. 鑾峰彇鍘熸潯鐮佷俊鎭�
+                var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+                    .Where(x => x.CurrentBarcode == originalBarcode)
+                    .FirstAsync();
+
+                if (originalLockInfo == null)
+                    return WebResponseContent.Instance.Error("鏈壘鍒板師鏉$爜閿佸畾淇℃伅");
+
+                var originalStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+                    .Where(x => x.Barcode == originalBarcode && x.StockId == originalLockInfo.StockId)
+                    .FirstAsync();
+
+                // 4. 鑾峰彇鎵�鏈夋柊鏉$爜鐨勫簱瀛樿褰�
+                var newStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+                    .Where(x => newBarcodes.Contains(x.Barcode))
+                    .ToListAsync();
+
+                // 5. 璁$畻鎬昏繕鍘熸暟閲�
+                decimal totalRevertQty = newStockDetails.Sum(x => x.StockQuantity);
+
+                // 6. 杩樺師鍘熸潯鐮佸簱瀛樿褰�
+                if (originalStockDetail != null)
+                {
+                    // 鍘熸潯鐮佸綋鍓嶆暟閲忓姞涓婃墍鏈夋柊鏉$爜鐨勬暟閲�
+                    originalStockDetail.StockQuantity += totalRevertQty;
+                    originalStockDetail.OutboundQuantity += totalRevertQty;
+                    await _stockInfoDetailService.Db.Updateable(originalStockDetail).ExecuteCommandAsync();
+                }
+
+                // 7. 杩樺師鍘熸潯鐮侀攣瀹氫俊鎭�
+                decimal totalAssignQty = newLockInfos.Sum(x => x.AssignQuantity);
+                originalLockInfo.AssignQuantity += totalAssignQty;
+                if (originalLockInfo.OrderQuantity < originalLockInfo.AssignQuantity)
+                {
+                    originalLockInfo.AssignQuantity=originalLockInfo.OrderQuantity;
+                }
+                originalLockInfo.Status = (int)OutLockStockStatusEnum.鍑哄簱涓�;
+                originalLockInfo.IsSplitted = 0;
+                await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();
+
+                // 8. 鍒犻櫎鎵�鏈夋柊鏉$爜鐨勯攣瀹氫俊鎭�
+                await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
+                    .Where(x => newBarcodes.Contains(x.CurrentBarcode))
+                    .ExecuteCommandAsync();
+
+                // 9. 鍒犻櫎鎵�鏈夋柊鏉$爜鐨勫簱瀛樿褰�
+                await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
+                    .Where(x => newBarcodes.Contains(x.Barcode))
+                    .ExecuteCommandAsync();
+
+                // 10. 鏍囪鎵�鏈夋媶鍖呰褰曚负宸叉挙閿�
+                foreach (var record in splitRecords)
+                {
+                    record.IsReverted = true;
+              
+                }
+                await Db.Updateable(splitRecords).ExecuteCommandAsync();
+
+                _unitOfWorkManage.CommitTran();
+
+                return WebResponseContent.Instance.OK($"鎾ら攢鎷嗗寘鎴愬姛锛屽叡杩樺師{splitRecords.Count}娆℃媶鍖咃紝鎬绘暟閲忥細{totalRevertQty}");
+
+            }
+            catch (Exception ex)
+            {
+                _unitOfWorkManage.RollbackTran();
+                return WebResponseContent.Instance.Error($"鎾ら攢鎷嗗寘澶辫触锛歿ex.Message}");
+            }
+        }
+        // 鑾峰彇鎷嗗寘淇℃伅
+        public async Task<WebResponseContent> GetSplitPackageInfo(string orderNo, string palletCode, string barcode)
+        {
+            var outStockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+                .Where(x => x.OrderNo == orderNo &&
+                           x.PalletCode == palletCode &&
+                           x.CurrentBarcode == barcode &&
+                           x.Status == 1)
+                .FirstAsync();
+
+            if (outStockInfo == null)
+                return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑鍑哄簱淇℃伅");
+
+            //var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+            //    .Where(x => x.Barcode == barcode)
+            //    .FirstAsync();
+
+            return WebResponseContent.Instance.OK("", new
+            {
+                MaterielCode = outStockInfo.MaterielCode,
+                RemainQuantity = outStockInfo.RemainQuantity,
+                Unit = outStockInfo.Unit
+            });
+        }
         /// <summary>
         /// 鑾峰彇鍙媶鍖呯殑鍑哄簱閿佸畾淇℃伅
         /// </summary>

--
Gitblit v1.9.3