From 154ecf3d94edef23247796ea313d00b35314563a Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 17 七月 2025 13:34:34 +0800
Subject: [PATCH] 1.来料检验优化
---
Controllers/Warehouse/MesCgthSqController.cs | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 1 deletions(-)
diff --git a/Controllers/Warehouse/MesCgthSqController.cs b/Controllers/Warehouse/MesCgthSqController.cs
index 5f38f1d..cc451a7 100644
--- a/Controllers/Warehouse/MesCgthSqController.cs
+++ b/Controllers/Warehouse/MesCgthSqController.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,6 +13,7 @@
public class MesCgthSqController : ControllerBase
{
private readonly MesCgthSqManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
/// <summary>
@@ -64,7 +66,7 @@
//ScanCode
/// <summary>
- /// 鑾峰彇鎵�鏈夊凡缁忓鏍哥殑鐢宠鍗�
+ /// 閲囪喘閫�璐�
/// </summary>
/// <returns></returns>
[HttpPost("ScanCode")]
@@ -74,6 +76,91 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(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,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //ScanCode
+ /// <summary>
+ /// 閲囪喘楠岄��
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ScanCgyt")]
+ public ResponseResult ScanCgyt(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanCgyt(query);
+ resultInfos.YtItem = m.getYtItem(resultInfos.tbBillList.ytdh);
+ resultInfos.YtBarInfo = m.getYtBarInfo(resultInfos.tbBillList.ytdh);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ //ScanCode
+ /// <summary>
+ /// 閲囪喘閫�璐у垹闄�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("deleteCgyt")]
+ public ResponseResult deleteCgyt(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.deleteCgyt(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("ScanCodeCF")]
+ public ResponseResult ScanCodeCF(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = m.ScanCodeCF(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
return new ResponseResult
{
status = 0,
--
Gitblit v1.9.3