提交代码

WCS.BLL/Services/Service/InstoreService.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using WCS.BLL.Config;
+using WCS.BLL.DbModels;
 using WCS.BLL.HardWare;
 using WCS.BLL.Manager;
 using WCS.BLL.Services.IService;
@@ -79,7 +80,7 @@ namespace WCS.BLL.Services.Service
             };
         }
 
-        public ResponseBase queryByMatSn(QueryByMatSnRequest request)
+        public async Task<ResponseBase> queryByMatSn(QueryByMatSnRequest request)
         {
             //获取货架
             var shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == request.ShelfCode).FirstOrDefault();
@@ -100,22 +101,58 @@ namespace WCS.BLL.Services.Service
                     Message = $"操作失败：货架[{request.ShelfCode}]不在入库模式!\r\n当前为{shelf.CurentMode}",
                 };
             }
+            //判断物料是否已入库
+            var inventory = await DbHelp.db.Queryable<InventoryDetail>().Where(t => t.MatSN == request.MatSn).FirstAsync();
+            if (inventory != null)
+            {
+                return new QueryByMatSnResponse()
+                {
+                    Code = 201,
+                    Message = $"操作失败：物料{inventory.MatSN}已入库，库位为{inventory.StoreCode}",
+                };
+            }
+            #region 获取物料数据
             //调用接口或者直接查询数据库
-            if (1 == 1)
+            if (1 != 1)
             {
 
             }
             //查询数据库
             else
             {
+                var matInfo = await DbHelp.db.Queryable<MatInfo>().Where(t => t.MatSn == request.MatSn).FirstAsync();
+                if (matInfo != null)
+                {
 
+                    shelf.InStoreData = new MatInfoResponse()
+                    {
+                        materialBar = matInfo.MatSn,
+                        materialCode = matInfo.MatCode,
+                        materialName = matInfo.MatName,
+                        materialQty = matInfo.MatQty,
+                        materialSpec = matInfo.MatSpec,
+                        batchNo = matInfo.MatBatch,
+                        supplier = matInfo.MatSupplier,
+                        customer = matInfo.MatCustomer,
+                    };
+
+                    return new QueryByMatSnResponse()
+                    {
+                        Code = 200,
+                        Data = shelf.InStoreData,
+                        Message = "success"
+                    };
+                }
+                else
+                    return new QueryByMatSnResponse()
+                    {
+                        Code = 201,
+                        Data = null,
+                        Message = $"不存在物料{request.MatSn}"
+                    };
             }
-            return new QueryByMatSnResponse()
-            {
-                Code = 200,
-                Data = new MatInfoModel(),
-                Message = "success"
-            };
+
+            #endregion
         }
 
         public async Task<ResponseBase> queryInstoreStatus(QueryByMatSnRequest request)
@@ -127,7 +164,7 @@ namespace WCS.BLL.Services.Service
                 return new ResponseCommon()
                 {
                     Code = 201,
-                    Message = $"操作失败：货架[{request.ShelfCode}]不存在!",
+                    Message = $"货架[{request.ShelfCode}]不存在!",
                 };
             }
             //判断当前是否是入库模式
@@ -136,7 +173,7 @@ namespace WCS.BLL.Services.Service
                 return new ResponseCommon()
                 {
                     Code = 201,
-                    Message = $"操作失败：货架[{request.ShelfCode}]不在入库模式!\r\n当前为{shelf.CurentMode}",
+                    Message = $"货架[{request.ShelfCode}]已退出入库模式!\r\n当前为{shelf.CurentMode}",
                 };
             }
             //这个时间相当于需要入库扫码后需要等待的时间