From 52d1e37bb116c995b601728bfe81e3816c3944c9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 27 六月 2025 08:22:33 +0800
Subject: [PATCH] 1.携客云到货单主表新增单据类型字段 2.条码入库前拆分
---
Controllers/Wom/WomdaaController.cs | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 1 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index c3fb79b..c761e97 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
@@ -12,6 +13,7 @@
public class WomdaaController : ControllerBase
{
private readonly WomdaaManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
#region 鐢熶骇棰嗘枡
@@ -102,7 +104,10 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanCodeCF(query);
+ 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,
@@ -425,5 +430,158 @@
}
}
+ //GetItemsXcsl
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栧緟鏀舵枡鐗╂枡鏄庣粏
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetItemsXcsl")]
+ public ResponseResult GetItemsXcsl(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsXcsl(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ //GetItemsXcsl
+ /// <summary>
+ /// 鐗╂枡鏉＄爜鏀舵枡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ScanXcsl")]
+ public ResponseResult ScanXcsl(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanXcsl(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //GetItemsXcsl
+ /// <summary>
+ /// 鏍规嵁绾夸綋鑾峰彇浠櫒閲嶉噺
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetWeightByXt")]
+ public ResponseResult GetWeightByXt(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetWeightByXt(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetXcslDaa")]
+ public ResponseResult GetXcslDaa([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetXcslDaa(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ //GetItemsXctl
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栧緟鎶曟枡鐗╂枡鏄庣粏
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetItemsXctl")]
+ public ResponseResult GetItemsXctl(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsXctl(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //GetItemsXcsl
+ /// <summary>
+ /// 鐗╂枡鏉＄爜鎶曟枡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ScanXctl")]
+ public ResponseResult ScanXctl(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanXctl(query);
+ 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