From 52d1e37bb116c995b601728bfe81e3816c3944c9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 27 六月 2025 08:22:33 +0800
Subject: [PATCH] 1.携客云到货单主表新增单据类型字段 2.条码入库前拆分
---
Controllers/Warehouse/InventoryController.cs | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 10 deletions(-)
diff --git a/Controllers/Warehouse/InventoryController.cs b/Controllers/Warehouse/InventoryController.cs
index 7d7799f..ae03c9d 100644
--- a/Controllers/Warehouse/InventoryController.cs
+++ b/Controllers/Warehouse/InventoryController.cs
@@ -1,6 +1,7 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -12,17 +13,19 @@
{
private readonly InventoryManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
+
/// <summary>
- /// 鎵弿搴撲綅鏉＄爜鐨勬帶鍒跺櫒鏂规硶
+ /// 鎵弿搴撲綅鏉＄爜鐨勬帶鍒跺櫒鏂规硶
/// </summary>
/// <param name="query">鍖呭惈搴撲綅浠ｇ爜鐨勬煡璇㈠璞�</param>
/// <returns>鎵弿缁撴灉淇℃伅</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- /// POST /api/Inventory/ScanDepotNo
- /// {
+ /// 璇锋眰绀轰緥:
+ /// POST /api/Inventory/ScanDepotNo
+ /// {
/// "DepotCode": "搴撲綅浠ｇ爜"
- /// }
+ /// }
/// </remarks>
[HttpPost("ScanDepotNo")]
public ResponseResult ScanDepotNo([FromBody] WarehouseQuery query)
@@ -45,18 +48,18 @@
}
/// <summary>
- /// 鎵弿鏉＄爜鐨勬帶鍒跺櫒鏂规硶
+ /// 鎵弿鏉＄爜鐨勬帶鍒跺櫒鏂规硶
/// </summary>
/// <param name="query">鍖呭惈鏉＄爜銆佸簱浣嶄唬鐮佸拰鐢ㄦ埛鍚嶇殑鏌ヨ瀵硅薄</param>
/// <returns>鎵弿缁撴灉淇℃伅</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- /// POST /api/Inventory/ScanBarcode
- /// {
+ /// 璇锋眰绀轰緥:
+ /// POST /api/Inventory/ScanBarcode
+ /// {
/// "barcode": "鏉＄爜",
/// "DepotCode": "搴撲綅浠ｇ爜",
/// "userName": "鐢ㄦ埛鍚�"
- /// }
+ /// }
/// </remarks>
[HttpPost("ScanBarcode")]
public ResponseResult ScanBarcode([FromBody] WarehouseQuery query)
@@ -77,4 +80,79 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ /// <summary>
+ /// 鏈熷垵鎵撳嵃鎵弿搴撲綅鑾峰彇浠撳簱淇℃伅鍜屽簱瀛樼粍缁囦俊鎭�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetDepoptsInfo")]
+ public ResponseResult GetDepoptsInfo([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetDepoptsInfo(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏈熷垵鎵撳嵃鎵弿搴撲綅鑾峰彇浠撳簱淇℃伅鍜屽簱瀛樼粍缁囦俊鎭�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetItemsList")]
+ public ResponseResult GetItemsList([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsList(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("printBeginBar")]
+ public ResponseResult PrintBeginBar([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ //var scanResult = m.BarCF(unity);
+ resultInfos.tbBillList.cfBarInfo = m.ExecuteBeginBar(query);
+ //resultInfos.tbBillList = m.ExecuteBeginBar(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3