From 38339731265cb8ffef7954fb90874036fd46f09d Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:46:11 +0800
Subject: [PATCH] 供应商分数获取调整
---
Controllers/Warehouse/MesXsckController.cs | 156 ++++++----------------------------------------------
1 files changed, 18 insertions(+), 138 deletions(-)
diff --git a/Controllers/Warehouse/MesXsckController.cs b/Controllers/Warehouse/MesXsckController.cs
index 4368ba0..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,
@@ -328,134 +338,4 @@
#endregion
- #region 鐢熶骇瓒呴
-
- /// <summary>
- /// 鑾峰彇鐢熶骇瓒呴鍗曞彿鍒楄〃
- /// </summary>
- /// <returns>瓒呴鍗曞彿鍒楄〃</returns>
- /// <response code="200">鎴愬姛鑾峰彇瓒呴鍗曞彿鍒楄〃</response>
- /// <response code="400">鑾峰彇澶辫触</response>
- [HttpPost("GetSccList")]
- public ResponseResult GetSccList(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetSccList(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇鐢熶骇瓒呴鍗曟槑缁�
- /// </summary>
- /// <param name="query">鏌ヨ鍙傛暟锛屽繀椤诲寘鍚玝illNo</param>
- /// <returns>瓒呴鍗曟槑缁嗗垪琛�</returns>
- /// <remarks>
- /// 璇锋眰绀轰緥:
- /// POST /api/MesItemBl/GetMesItemBlDetailBySccBillNo
- /// {
- /// "billNo": "SC202401010001"
- /// }
- /// </remarks>
- /// <response code="200">鎴愬姛鑾峰彇瓒呴鍗曟槑缁�</response>
- /// <response code="400">鑾峰彇澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
- [HttpPost("GetMesItemBlDetailBySccBillNo")]
- public ResponseResult GetMesItemBlDetailBySccBillNo(
- [FromBody] WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetMesItemBlDetailBySccBillNo(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鐢熶骇瓒呴鎵弿鏉＄爜1
- /// </summary>
- /// <param name="query">鏌ヨ鍙傛暟</param>
- /// <returns>鎵弿缁撴灉鍜屽緟澶勭悊鍒楄〃</returns>
- /// <remarks>
- /// 璇锋眰绀轰緥:
- /// POST /api/MesItemBl/ScanBarcodeForOverPicking
- /// {
- /// "billNo": "WO202401010001",
- /// "barcode": "1234567890",
- /// "userName": "admin",
- /// "blNo": "SC202401010001"
- /// }
- /// </remarks>
- /// <response code="200">鎵弿鎴愬姛</response>
- /// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
- [HttpPost("ScanBarcodeForOverPicking")]
- public ResponseResult ScanBarcodeForOverPicking(
- [FromBody] WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var (success, pendingList) =
- _manager.ScanBarcodeForOverPicking(query);
- resultInfos.success = success;
- resultInfos.pendingList = pendingList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("PrintBarcodeForOverPicking")]
- public ResponseResult PrintForOverPicking(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var (success, pendingList) =
- _manager.PrintBarcodeForOverPicking(query);
- resultInfos.success = success;
- resultInfos.pendingList = pendingList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3