From 8b7abd97e7b69800789134ed8e809e19a5b5ba74 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 00:30:27 +0800
Subject: [PATCH] 111
---
Controllers/Warehouse/MesBarCFController.cs | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs
index 9c2938b..2f33766 100644
--- a/Controllers/Warehouse/MesBarCFController.cs
+++ b/Controllers/Warehouse/MesBarCFController.cs
@@ -1,12 +1,9 @@
锘縰sing System.Dynamic;
-using Masuit.Tools.Win32.AntiVirus;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
-using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.Controllers.Warehouse;
@@ -14,9 +11,8 @@
[Route("api/[controller]")]
public class MesBarCFController : ControllerBase
{
- private readonly MesBarCFManager m = new();
-
private readonly MesPrintMangeer _mCf = new();
+ private readonly MesBarCFManager m = new();
/// <summary>
/// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
@@ -47,6 +43,32 @@
/// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
/// </summary>
/// <returns></returns>
+ [HttpPost("GetBarInfoBefore")]
+ public ResponseResult GetBarInfoBefore(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetBarInfoBefore(unity);
+ resultInfos.tbMesItems =
+ m.GetItemNo(resultInfos.tbBillList.ITEM_ID);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
[HttpPost("BarCF")]
public ResponseResult BarCF(WarehouseQuery unity)
{
@@ -54,7 +76,7 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = new ExpandoObject();
- //resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
var scanResult = m.BarCF(unity);
resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
return new ResponseResult
@@ -70,18 +92,20 @@
}
}
+
/// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭紙鍏ュ簱鍓嶆媶鍒嗭級
+ /// PDA閲嶆墦鏉＄爜
/// </summary>
/// <returns></returns>
- [HttpPost("GetBarInfoBefore")]
- public ResponseResult GetBarInfoBefore(WarehouseQuery unity)
+ [HttpPost("BarRePrint")]
+ public ResponseResult BarRePrint(WarehouseQuery unity)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetBarInfoBefore(unity);
- resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ITEM_ID);
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getPrintBarInfo(unity);
return new ResponseResult
{
status = 0,
@@ -95,8 +119,9 @@
}
}
+
/// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭� 锛堝叆搴撳墠鎷嗗垎锛�
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost("BarCfBefore")]
@@ -121,5 +146,4 @@
return ResponseResult.ResponseError(ex);
}
}
-
}
\ No newline at end of file
--
Gitblit v1.9.3