提交代码

WCS.WebApi/Controllers/InOutRecordController.cs

@@ -45,13 +45,19 @@ namespace WCS.WebApi.Controllers
             var columns = new[]
             {
                 new ExportableColumn("序号","RowNumber"),
+                new ExportableColumn("库位","StoreCode"),
                 new ExportableColumn("物料编码","MatCode"),
                 new ExportableColumn("物料名称","MatName"),
                 new ExportableColumn("规格","MatSpec"),
                 new ExportableColumn("批次","MatBatch"),
+                new ExportableColumn("供应商","MatSupplier"),
+                new ExportableColumn("客户","MatCustomer"),
                 new ExportableColumn("数量","MatQty"),
-                new ExportableColumn("库位","StoreCode"),
-                new ExportableColumn("入库时间","InstoreTime"),
+                new ExportableColumn("类型","Direction"),
+
+                new ExportableColumn("操作人","OperateUser"),
+                new ExportableColumn("操作时间","OperateTime"),
+
                 new ExportableColumn("物料SN", "MatSN"),
             };
             if (data == null)

WCS.WebApi/Controllers/InstoreController.cs

@@ -114,5 +114,33 @@ namespace WebApi.Controllers
                 };
             }
         }
+
+
+
+        /// <summary>
+        /// <20><><EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD>ύ<EFBFBD><E1BDBB><EFBFBD><EFBFBD>
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("singleLightCommitInstore")]
+        [HttpPost(Name = "queryInstoreStatus")]
+        public async Task<ResponseBase> singleLightCommitInstore(QueryByMatSnRequest request)
+        {
+            //TODO:<3A><><EFBFBD><EFBFBD> <20><><EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD>ύ<EFBFBD><E1BDBB><EFBFBD><EFBFBD>
+            try
+            {
+                return await _instoreService.queryInstoreStatus(request);
+                //ShelfManager.
+                //
+            }
+            catch (Exception ex)
+            {
+                return new ResponseCommon()
+                {
+                    Code = 300,
+                    Message = $"<22><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>:{ex.Message}",
+                };
+            }
+        }
     }
 }

WCS.WebApi/Controllers/OutstoreController.cs

@@ -215,5 +215,79 @@ namespace WebApi.Controllers
                 };
             }
         }
+
+
+        /// <summary>
+        /// <20><><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("singleLightGoInOutstore")]
+        [HttpPost(Name = "singleLightGoInOutstore")]
+        public async Task<ResponseBase> singleLightGoInOutstore(GetOutOrderDetailRequest request)
+        {
+            //TODO<44><4F><EFBFBD><EFBFBD>
+            try
+            {
+                return await _outstoreService.GoInOutstore(request);
+            }
+            catch (Exception ex)
+            {
+                return new ResponseBase()
+                {
+                    Code = 300,
+                    Message = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽʧ<CABD>ܣ<EFBFBD>" + ex.Message,
+                };
+            }
+        }
+
+        /// <summary>
+        /// <20><><EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("singleLightGoOutOutstore")]
+        [HttpPost(Name = "singleLightGoOutOutstore")]
+        public async Task<ResponseBase> singleLightGoOutOutstore(GetOutOrderDetailRequest request)
+        {
+            //TODO<44><4F><EFBFBD><EFBFBD>
+            try
+            {
+                return await _outstoreService.GoOutOutstore(request);
+            }
+            catch (Exception ex)
+            {
+                return new ResponseBase()
+                {
+                    Code = 300,
+                    Message = "<22><>ѯʧ<D1AF>ܣ<EFBFBD>" + ex.Message,
+                };
+            }
+        }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD>ȷ<EFBFBD>ϳ<EFBFBD><CFB3><EFBFBD>
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("singleLightConfirmOutstore")]
+        [HttpPost(Name = "singleLightConfirmOutstore")]
+        public async Task<ResponseBase> singleLightConfirmOutstore(GetOutOrderDetailRequest request)
+        {
+            //TODO<44><4F><EFBFBD><EFBFBD>
+            try
+            {
+                return await _outstoreService.GoOutOutstore(request);
+            }
+            catch (Exception ex)
+            {
+                return new ResponseBase()
+                {
+                    Code = 300,
+                    Message = "<22><>ѯʧ<D1AF>ܣ<EFBFBD>" + ex.Message,
+                };
+            }
+        }
+
     }
 }