From a39e1db786da4d91121c11844b87a5e5e84e8a86 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 05 九月 2025 08:19:40 +0800
Subject: [PATCH] 1.ERP修改 2.其他出库优化 3.生产领料新增开工时间
---
Controllers/Warehouse/MesItemBlController.cs | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/Controllers/Warehouse/MesItemBlController.cs b/Controllers/Warehouse/MesItemBlController.cs
index ee7123a..5505fed 100644
--- a/Controllers/Warehouse/MesItemBlController.cs
+++ b/Controllers/Warehouse/MesItemBlController.cs
@@ -1,7 +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;
@@ -12,9 +14,10 @@
/// </summary>
[Route("api/[controller]")]
[ApiController]
-public class MesItemBlController : ControllerBase
+public class MesItemBlController : BaseController
{
private readonly MesItemBlManager _manager = new();
+ private readonly MesPrintMangeer _mCf = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -201,9 +204,12 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var (success, pendingList) = _manager.SplitBarcode(query);
- resultInfos.success = success;
- resultInfos.pendingList = pendingList;
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = _manager.SplitBarcode(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+ //resultInfos.success = success;
+ //resultInfos.pendingList = pendingList;
return new ResponseResult
{
status = 0,
@@ -226,12 +232,12 @@
/// <response code="200">鎴愬姛鑾峰彇琛ユ枡鍗曞彿鍒楄〃</response>
/// <response code="400">鑾峰彇澶辫触</response>
[HttpPost("GetSCBLBillNo")]
- public ResponseResult GetSCBLBillNo(WarehouseQuery query)
+ public ResponseResult GetSCBLBillNo([FromBody] dynamic query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetSCBLBillNo(query);
+ resultInfos.tbBillList = _manager.GetSCBLBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -280,6 +286,26 @@
}
}
+ [HttpPost("GetLineInfo")]
+ public ResponseResult GetLineInfo([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbLineInfo = _manager.GetLineInfo(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
/// 鎵弿鏉＄爜
/// </summary>
--
Gitblit v1.9.3