From 17ede350f6cc2be9059a08a90e21de79c296648c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 14 八月 2025 17:35:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaService
---
Controllers/Warehouse/MesBarCFController.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs
index 33abddd..9c2938b 100644
--- a/Controllers/Warehouse/MesBarCFController.cs
+++ b/Controllers/Warehouse/MesBarCFController.cs
@@ -54,7 +54,7 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = new ExpandoObject();
- resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+ //resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
var scanResult = m.BarCF(unity);
resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
return new ResponseResult
@@ -69,4 +69,57 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭紙鍏ュ簱鍓嶆媶鍒嗭級
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetBarInfoBefore")]
+ public ResponseResult GetBarInfoBefore(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetBarInfoBefore(unity);
+ resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ITEM_ID);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭� 锛堝叆搴撳墠鎷嗗垎锛�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("BarCfBefore")]
+ public ResponseResult BarCfBefore(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+ var scanResult = m.BarCfBefore(unity);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfBeforeInfo(scanResult);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3