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/MesBarCFController.cs | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs
index adfe372..3199bfb 100644
--- a/Controllers/Warehouse/MesBarCFController.cs
+++ b/Controllers/Warehouse/MesBarCFController.cs
@@ -1,9 +1,12 @@
锘縰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;
@@ -12,6 +15,8 @@
public class MesBarCFController : ControllerBase
{
private readonly MesBarCFManager m = new();
+
+ private readonly MesPrintMangeer _mCf = new();
/// <summary>
/// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
@@ -42,17 +47,73 @@
/// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
/// </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)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.BarCF(unity);
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+ var scanResult = m.BarCF(unity);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
return new ResponseResult
{
status = 0,
- message = resultInfos.tbBillList,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("BarCfBefore")]
+ public ResponseResult BarCfBefore(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+ var scanResult = m.BarCfBefore(unity);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfBeforeInfo(scanResult);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
data = resultInfos
};
}
--
Gitblit v1.9.3