From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:23:44 +0800
Subject: [PATCH] 1111
---
Controllers/Warehouse/MesXsckController.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Controllers/Warehouse/MesXsckController.cs b/Controllers/Warehouse/MesXsckController.cs
index 7522d21..6b984aa 100644
--- a/Controllers/Warehouse/MesXsckController.cs
+++ b/Controllers/Warehouse/MesXsckController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -15,6 +16,8 @@
public class MesXsckController : BaseController
{
private readonly MesXsckManager _manager = new();
+
+ private readonly MesPrintMangeer _mCf = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -196,14 +199,21 @@
/// <response code="200">鎷嗗垎鎴愬姛</response>
/// <response code="400">鎷嗗垎澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
[HttpPost("SplitBarcode")]
- public ResponseResult SplitBarcode([FromBody] WarehouseQuery query)
+ public ResponseResult SplitBarcode(WarehouseQuery query)
{
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);
+
+ //dynamic resultInfos = new ExpandoObject();
+ //var (success, pendingList) = _manager.SplitBarcode(query);
+ //resultInfos.success = success;
+ //resultInfos.pendingList = pendingList;
+
return new ResponseResult
{
status = 0,
@@ -266,8 +276,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetMesItemFHTZetailByBillNo(query, RequestInfo);
+ resultInfos.tbBillList = _manager.GetMesItemFHTZetailByBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -306,12 +315,14 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = _manager.XSCKScanBarcode(query);
if (resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -326,4 +337,5 @@
}
#endregion
+
}
\ No newline at end of file
--
Gitblit v1.9.3