From 8f28ca63dde584e5fefe51a07e69fd9b1af76fd2 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 09 六月 2025 12:28:27 +0800
Subject: [PATCH] 1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段
---
Controllers/Warehouse/MesBarCFController.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs
index adfe372..33abddd 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>
/// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
@@ -48,11 +53,14 @@
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
};
}
--
Gitblit v1.9.3