From ac2f359d397c0ec5eb87c9cbc415584d1d88439f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 16 九月 2025 08:56:53 +0800
Subject: [PATCH] 采购退料:列表选择、列表明细更改为存储过程，添加组织隔离，添加库位列表，添加隐藏完结单号功能
---
Controllers/Warehouse/MesXsckController.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Controllers/Warehouse/MesXsckController.cs b/Controllers/Warehouse/MesXsckController.cs
index 8d67113..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;
@@ -12,9 +13,11 @@
/// </summary>
[Route("api/[controller]")]
[ApiController]
-public class MesXsckController : ControllerBase
+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,
@@ -217,7 +227,7 @@
}
}
- #region 鐢熶骇琛ユ枡
+ #region 閿�鍞嚭搴�
/// <summary>
/// 鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
@@ -231,7 +241,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetFHTZBillNo(query);
+ resultInfos.tbBillList = _manager.GetFHTZBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -266,7 +276,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetMesItemFHTZetailByBillNo(query);
+ resultInfos.tbBillList = _manager.GetMesItemFHTZetailByBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
--
Gitblit v1.9.3