From 4701f1058d926173e0867bb014f5eb940186bcc4 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 11 十二月 2025 13:36:33 +0800
Subject: [PATCH] 挪蓝宝委外(2025-12-11)
---
Controllers/Wom/WwGdhbController.cs | 587 +++++++++++++++
service/Wom/WwGdManager.cs | 424 +++++++++--
service/Wom/WwgdhbManager.cs | 1095 ++++++++++++++++++++++++++++
Controllers/Wom/WwGdController.cs | 164 ++++
4 files changed, 2,187 insertions(+), 83 deletions(-)
diff --git a/Controllers/Wom/WwGdController.cs b/Controllers/Wom/WwGdController.cs
index 8ec8e60..4058058 100644
--- a/Controllers/Wom/WwGdController.cs
+++ b/Controllers/Wom/WwGdController.cs
@@ -1,17 +1,173 @@
-锘縰sing System.Dynamic;
-using Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
+using System.Dynamic;
namespace NewPdaSqlServer.Controllers.Wom;
[ApiController]
[Route("api/[controller]")]
-public class WwGdController : ControllerBase
+public class WwGdController : BaseController
{
private readonly WwGdManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
+
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <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, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <summary>
+ ///
+ /// 鑾峰彇濮斿鍑哄簱鐢宠鍗曞彿
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetWWCKsq")]
+ public ResponseResult GetWWCKsq([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetWWCKsq(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁濮斿棰嗘枡鐢宠鍗曡幏鍙栨槑缁�
+ /// </summary>
+ /// <param name="query">宸ュ崟鍙疯姹傚弬鏁�</param>
+ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ [HttpPost("GetItemsByWwckNo")]
+ public ResponseResult GetItemsByWwckNo(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凣etItemsByDaa001鏂规硶鑾峰彇浠ｉ鐗╂枡鏄庣粏
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsByWwckNo(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ [HttpPost("WwckScanCode")]
+ public ResponseResult WwckScanCode(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凷canCode鏂规硶杩涜鎵爜鎿嶄綔
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.WwckScanCode(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);
+ }
+ }
+
+ /// <summary>
+ /// 濮斿鐢宠鍑哄簱鎷嗗垎
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("WwckScanCodeCF")]
+ public ResponseResult WwckScanCodeCF(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凷canCodeCF鏂规硶杩涜鎵爜纭鎿嶄綔
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = m.WwckScanCodeCF(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
/// 鎵爜
@@ -114,7 +270,7 @@
{
// 璋冪敤WwGdManager鐨凣etItemsByDaa001鏂规硶鑾峰彇浠ｉ鐗╂枡鏄庣粏
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItemsByDaa001(query);
+ resultInfos.tbBillList = m.GetItemsByDaa001(query, RequestInfo);
return new ResponseResult
{
status = 0,
diff --git a/Controllers/Wom/WwGdhbController.cs b/Controllers/Wom/WwGdhbController.cs
new file mode 100644
index 0000000..d3e57a8
--- /dev/null
+++ b/Controllers/Wom/WwGdhbController.cs
@@ -0,0 +1,587 @@
+锘縰sing System.Dynamic;
+using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
+using NewPdaSqlServer.service.Wom;
+using NewPdaSqlServer.util;
+
+namespace NewPdaSqlServer.Controllers.Wom;
+
+[ApiController]
+[Route("api/[controller]")]
+public class WwGdhbController : ControllerBase
+{
+ private readonly WwgdhbManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
+
+ #region 鐢熶骇棰嗘枡鍚堝苟
+
+ //GetProductionPickDaa001
+ /// <summary>
+ /// 妯＄硦鏌ヨ宸ュ崟鍙峰苟杩斿洖
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetProductionPickDaa001")]
+ public ResponseResult GetProductionPickDaa001(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //GetItemsByDaa001
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetItemsByDaa001")]
+ public ResponseResult GetItemsByDaa001(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsByDaa001(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //ScanCode
+ [HttpPost("ScanCode")]
+ public ResponseResult ScanCode(WarehouseQuery query)
+ {
+ try
+ {
+ 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);
+ }
+ }
+
+ //ScanCodeCF
+ [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,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] Womdaa data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] Womdaa data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] Womdaa data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ #endregion
+
+ #region 鐜板満绠＄悊
+
+
+ /// <summary>
+ /// 鎵弿娉ㄥ鐮侊紝鑾峰彇宸ュ崟鍜屾潯鐮佷俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("getZsBarInfo")]
+ public ResponseResult getZsBarInfo([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.ZsBarInfo = m.getZsBarInfo(query);
+ resultInfos.tbBillList.Traceability = m.getTraceability(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 浜у搧缁戝畾锛岃拷婧爜鍜屾祦姘寸爜缁戝畾
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ProductBinding")]
+ public ResponseResult ProductBinding([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList = m.ProductBinding(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗℃澘淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("getKbBarInfo")]
+ public ResponseResult getKbBarInfo([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.KbBarInfo = m.getKbBarInfo(query);
+ resultInfos.tbBillList.KbBarMxInfo = m.getKbBarMxInfo(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇绠辩爜淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("getXBarInfo")]
+ public ResponseResult getXBarInfo([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.XBarInfo = m.getXBarInfo(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 缁戝畾绠辩爜涓庢墭鏉跨爜
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("submitAllChecked")]
+ public ResponseResult submitAllChecked([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList = m.submitAllChecked(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍稿閫佹
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("submitInspection")]
+ public ResponseResult submitInspection([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList = m.SubmitKbInspection(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //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
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index dd7f308..498fcf3 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -1,12 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Threading.Tasks.Dataflow;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Threading.Tasks.Dataflow;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Wom;
@@ -138,86 +140,134 @@
}
}
- public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
+
+ /// <summary>
+ /// 鑾峰彇搴撲綅淇℃伅
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public dynamic GetBarKwByItem(dynamic unity)
{
- return getDaa001(query);
+ if (unity == null)
+ throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+
+ if (string.IsNullOrEmpty(unity.itemId?.ToString()))
+ throw new ArgumentException("鐗╂枡ID涓嶈兘涓虹┖", nameof(unity.itemId));
+
+ try
+ {
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@itemId",unity.itemId)
+ };
+
+ return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId", parameters);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇鏉＄爜淇℃伅澶辫触锛歿ex.Message}");
+ }
+
}
- private ProductionPickDto getDaa001(WarehouseQuery query)
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ public dynamic GetXcslDaa(dynamic unity, dynamic RequestInfo)
{
- if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
-
- var wwgd = Db.Queryable<WwGd, MesItems>((a, i) =>
- new JoinQueryInfos(JoinType.Left,
- a.Daa003 == i.ItemId))
- .Where((a, i) => a.Daa001 == query.daa001 && (a.PcSh ?? 0) == 1)
- .Select((a, i) => new
- {
- a.Daa001, a.RwdGuid
- }).First();
-
- if (wwgd?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
-
- var womdabs = Db
- .Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>(
- (a, b, c, d) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.Id == b.Pid,
- JoinType.Inner,
- c.Id == b.Dab003,
- JoinType.Inner, b.Erpid.ToString() == d.ErpId
- ))
- .Where((a, b, c, d) =>
- a.Daa001 == query.daa001 )
- .Select((a, b, c, d) => new WwGdDetail
- {
- Pid = b.Pid,
- Dab003 = b.Dab003,
- Dab006 = b.Dab006,
- Dab007 = b.Dab007,
- wNum = b.Dab006 - b.Dab007, // 璁＄畻瀛楁 W_NUM
- ItemName = c.ItemName, // 鍔ㄦ�佸瓧娈� ITEM_NAME
- ItemNo = c.ItemNo // 鍔ㄦ�佸瓧娈� ITEM_NO
- })
- .ToList();
-
- var list = womdabs.Where(s => s.wNum > 0).ToList();
-
- var mesInvItemOutCDetailsList = Db
- .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
- ((a, b, c) =>
- new JoinQueryInfos(
- JoinType.Inner, a.ItemId == b.Id,
- JoinType.Inner, c.DepotId == a.DepotId
- ))
- .Where((a, b, c) => a.WorkNo == query.daa001)
- .Select((a, b, c) => new MesInvItemOutCDetails
- {
- ItemName = b.ItemName,
- ItemNo = b.ItemNo,
- ItemId = a.ItemId,
- DepotId = a.DepotId,
- WorkNo = a.WorkNo,
- DepotName = c.DepotName,
- Quantity = a.Quantity
- })
- .ToList();
-
- var womcaa = Db.Queryable<ProductionOrder>()
- .Where(s => s.Guid == wwgd.RwdGuid)
- .First();
-
- var dto = new ProductionPickDto
+ var orgId = RequestInfo.OrgId;
+ var parameters = new List<SugarParameter>
{
- daa001 = wwgd.Daa001,
- PlanNo = womcaa.ErpProductionOrderNo,
- totals1 = womdabs,
- daisao1 = list,
- yisao = mesInvItemOutCDetailsList
+ new SugarParameter("@selectKey", unity.selectKey),
+ new SugarParameter("@inP1", orgId), // 鍙�夊弬鏁�
+ new SugarParameter("@inP2", unity.selDaaType), // 鍙�夊弬鏁�
+ new SugarParameter("@inP3", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP4", null), // 鍙�夊弬鏁�
+ // ...鍏朵粬鍙�夊弬鏁�
};
+ var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwll_list @selectKey, @inP1, @inP2, @inP3, @inP4", parameters);
+ return result;
+ }
- return dto;
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ public dynamic GetWWCKsq(dynamic unity, dynamic RequestInfo)
+ {
+ var orgId = RequestInfo.OrgId;
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@pi_selectKey", unity.selectKey),
+ new SugarParameter("@pi_type", unity.type), // 鍙�夊弬鏁�
+ new SugarParameter("@pi_orgId", orgId), // 鍙�夊弬鏁�
+ new SugarParameter("@inP1", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP2", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP3", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP4", null), // 鍙�夊弬鏁�
+ // ...鍏朵粬鍙�夊弬鏁�
+ };
+ var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwcksq_list @pi_selectKey, @pi_type, @pi_orgId , @inP1, @inP2, @inP3, @inP4", parameters);
+ return result;
+ }
+
+ /// <summary>
+ /// 鍒楄〃鏄庣粏
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ public dynamic GetItemsByDaa001(WarehouseQuery query, dynamic RequestInfo)
+ {
+ return getDaa001(query, RequestInfo);
+ }
+
+ private dynamic getDaa001(WarehouseQuery query, dynamic RequestInfo)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("璇烽�夊伐鍗曞彿锛�");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (string.IsNullOrEmpty(query.daa001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍙蜂笉瀛樺湪", nameof(query.daa001));
+
+ var orgId = RequestInfo.OrgId;
+ if (orgId == null)
+ throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+ var parameters = new[]
+ {
+ new SugarParameter("@daa001", query.daa001),
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+ try
+ {
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_wwll_detailList @daa001,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 鑾峰彇宸ュ崟璁″垝鍙�
+ return new
+ {
+ daa001 = query.daa001,
+ PlanNo = planNo,
+ items = items,
+ ysitems = ysitems
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"{ex.Message}");
+ }
}
#region 濮斿閫�鏂�
@@ -709,6 +759,212 @@
}
#endregion
+
+ /// <summary>
+ /// 濮斿鍑哄簱鐢宠鍗曞彿鑾峰彇鏄庣粏
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ /// <exception cref="ArgumentNullException"></exception>
+ /// <exception cref="ArgumentException"></exception>
+ public dynamic GetItemsByWwckNo(WarehouseQuery query, dynamic RequestInfo)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("璇烽�夊伐鍗曞彿锛�");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (string.IsNullOrEmpty(query.daa001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍙蜂笉瀛樺湪", nameof(query.daa001));
+
+ var orgId = RequestInfo.OrgId;
+ if (orgId == null)
+ throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+ var parameters = new[]
+ {
+ new SugarParameter("@daa001", query.daa001),
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+ try
+ {
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_wwcksq_detailList @daa001,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 鑾峰彇宸ュ崟璁″垝鍙�
+ return new
+ {
+ daa001 = query.daa001,
+ PlanNo = planNo,
+ items = items,
+ ysitems = ysitems,
+ allList = blDetails
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"{ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// w濮斿鍑哄簱
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public ProductionPickDto WwckScanCode(WarehouseQuery query)
+ {
+ var _strMsg = "";
+ var _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ using (var cmd = new SqlCommand("[PRC_PDA_WWCK_SCAN]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ //SqlParameter[] parameters =
+ //{
+ // new("@outMsg", SqlDbType.NVarChar, 300),
+ // new("@outSum", SqlDbType.NVarChar, 300),
+ // new("@barcode_num", SqlDbType.NVarChar, 300),
+ // new("@split_num", SqlDbType.NVarChar, 300),
+ // new("@c_User", query.userName),
+ // new("@p_biLL_no", query.daa001),
+ // new("@p_item_barcode", query.barcode)
+ //};
+
+ var parameters = new SqlParameter[]
+ {
+ new SqlParameter("@C_USER", SqlDbType.NVarChar, 100) { Value = query.userName ?? string.Empty },
+ new SqlParameter("@P_BILL_NO", SqlDbType.NVarChar, 50) { Value = query.billNo ?? string.Empty },
+ new SqlParameter("@P_ITEM_BARCODE", SqlDbType.NVarChar, 100) { Value = query.barcode ?? string.Empty },
+ new SqlParameter("@P_BL_NO", SqlDbType.NVarChar, 100) { Value = query.blNo ?? string.Empty },
+ new SqlParameter("@P_TYPE", SqlDbType.NVarChar, 20) { Value = query.Type ?? string.Empty },
+ new SqlParameter("@OUT_MSG", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new SqlParameter("@OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@BARCODE_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ },
+ new SqlParameter("@SPLIT_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ }
+ };
+
+ parameters[5].Direction = ParameterDirection.Output;
+ parameters[6].Direction = ParameterDirection.Output;
+ parameters[7].Direction = ParameterDirection.Output;
+ parameters[8].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[5].Value.ToString();
+ _intSum = parameters[6].Value.ToString();
+
+ var barcodeNum = parameters[7].Value.ToString();
+ var splitNum = parameters[8].Value.ToString();
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.daa001,
+ barcodeNum = barcodeNum,
+ splitNum = splitNum,
+ barcode = query.barcode,
+ strMsg = _strMsg,
+ result = _intSum
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 濮斿鎷嗗垎鍑哄簱鎷嗗垎
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public ProductionPickDto WwckScanCodeCF(WarehouseQuery query)
+ {
+ // Validate input parameters
+ if (string.IsNullOrEmpty(query.userName))
+ throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
+
+ if (string.IsNullOrEmpty(query.barcode))
+ throw new Exception("璇锋壂鎻忔潯鐮侊紒");
+
+ if ((query.Num ?? 0) <= 0)
+ throw new Exception("璇疯緭鍏ユ纭殑鍙戞枡鏁伴噺锛�");
+
+ if (string.IsNullOrEmpty(query.blNo))
+ throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
+
+ // Prepare parameters for the stored procedure
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@C_USER", query.userName),
+ new SugarParameter("@P_BILL_NO", query.billNo),
+ new SugarParameter("@P_ITEM_BARCODE", query.barcode),
+ new SugarParameter("@P_BL_NO", query.blNo),
+ new SugarParameter("@P_TYPE", query.Type),
+ new SugarParameter("@NUM", query.Num),
+ new SugarParameter("@OUT_MSG", "", System.Data.DbType.String, ParameterDirection.Output),
+ new SugarParameter("@OUT_SUM", 0, System.Data.DbType.Int32, ParameterDirection.Output),
+ new SugarParameter("@OUT_CF_BAR", "", System.Data.DbType.String, ParameterDirection.Output)
+ };
+
+ // Execute the stored procedure
+ Db.Ado.UseStoredProcedure().ExecuteCommand("PRC_PDA_WWCK_SCAN_CF", parameters);
+
+ // Get output parameters
+ var outMsg = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_MSG")?.Value?.ToString();
+ var outSum = Convert.ToInt32(parameters.FirstOrDefault(p => p.ParameterName == "@OUT_SUM")?.Value ?? -1);
+ var outCfBar = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_CF_BAR")?.Value?.ToString();
+
+ // Handle the result
+ if (outSum == -1)
+ {
+ throw new Exception(outMsg ?? "鎿嶄綔澶辫触");
+ }
+
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = outCfBar//鎷嗗垎鍚庢潯鐮�
+ };
+
+ return dto;
+ }
#region 濮斿琛ユ枡
@@ -1288,7 +1544,7 @@
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+ .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == true)
.First();
if (mesItemBl == null)
@@ -1356,9 +1612,19 @@
if (itemOut == null)
{
+ var outNoType = "WWBL(濮斿琛ユ枡)";
+ if (query.Type == "濮斿琛ユ枡")
+ {
+ outNoType = "WWBL(濮斿琛ユ枡)";
+ }
+ else
+ {
+ outNoType = "WWCL(濮斿瓒呴)";
+ }
+
// 鍒涘缓鏂扮殑鍑哄簱鍗�
var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)");
+ var outNo = BillNo.GetBillNo(outNoType);
// 鎻掑叆鍑哄簱鍗曚富琛�
executeCommand += db.Insertable(new MesInvItemOuts
diff --git a/service/Wom/WwgdhbManager.cs b/service/Wom/WwgdhbManager.cs
new file mode 100644
index 0000000..6c13b59
--- /dev/null
+++ b/service/Wom/WwgdhbManager.cs
@@ -0,0 +1,1095 @@
+锘縰sing Masuit.Tools;
+using Masuit.Tools.Models;
+using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
+using NewPdaSqlServer.util;
+using SqlSugar;
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
+
+namespace NewPdaSqlServer.service.Wom;
+
+public class WwgdhbManager : Repository<Womdaa>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomdaaManager.cs
+
+ //鑾峰彇宸ュ崟鍙�
+ public List<string> GetProductionPickDaa001(WarehouseQuery query)
+ {
+ var sql =
+ "SELECT DAAhb001 FROM WOMDAAhb A WHERE DAAHB001 = " +
+ query.hbNo +
+ " and FSTATUS=1 order by a.CREATE_DATE desc";
+
+ return Db.Ado.SqlQuery<string>(sql);
+ }
+
+ //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
+ public dynamic GetItemsByDaa001(WarehouseQuery query)
+ {
+ return getDaa001(query);
+ }
+
+ public ProductionPickDto ScanCode(WarehouseQuery query)
+ {
+ var _strMsg = "";
+ var _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.hbNo.IsNullOrEmpty()) throw new Exception("鍚堝苟棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ using (var cmd = new SqlCommand("[prc_pda_WWLLHB]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.NVarChar, 300),
+ new("@barcode_num", SqlDbType.NVarChar, 300),
+ new("@split_num", SqlDbType.NVarChar, 300),
+ new("@c_User", query.userName),
+ new("@p_biLL_no", query.hbNo),
+ new("@p_item_barcode", query.barcode)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ parameters[3].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[0].Value.ToString();
+ _intSum = parameters[1].Value.ToString();
+
+ var barcodeNum = parameters[2].Value.ToString();
+ var splitNum = parameters[3].Value.ToString();
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.hbNo,
+ barcodeNum = barcodeNum,
+ splitNum = splitNum,
+ barcode = query.barcode,
+ strMsg = _strMsg,
+ result = _intSum
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ //prC_pda_SCLL_CF
+ public ProductionPickDto ScanCodeCF(WarehouseQuery query)
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.hbNo.IsNullOrEmpty()) throw new Exception("鍚堝苟棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ if (query.Num is null or 0) throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
+
+ var _strMsg = "";
+ var _intSum = "";
+ var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_pda_WWLLHB_CF]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 2000),
+ new("@outSum", SqlDbType.NVarChar, 300),
+ new("@outCfBar", SqlDbType.NVarChar, 300),
+ new("@c_User", query.userName),
+ new("@p_biLL_no", query.hbNo),
+ new("@p_item_barcode", query.barcode),
+ new("@num", query.Num)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[0].Value.ToString();
+ _intSum = parameters[1].Value.ToString();
+ _cfBar = parameters[2].Value.ToString();
+
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.hbNo,
+ barcode = query.barcode, //鍘熸潯鐮�
+ cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ private dynamic getDaa001(WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.hbNo)) throw new Exception("鍚堝苟鍗曞彿涓虹┖");
+
+ var queryResult = Db.Queryable<Womdaahb>()
+ .Where(b => b.Daahb001 == query.hbNo && b.Fstatus == 1 && b.orderType=="濮斿宸ュ崟")
+ .Select(b => new
+ {
+ b.Daahb001,
+ b.Daah009,
+ b.OrgId
+ // 鍏朵粬闇�瑕佺殑Womdaahb瀛楁
+ })
+ .First();
+
+ if (queryResult?.Daahb001 == null) throw new Exception("鍚堝苟鍗曞彿涓嶅瓨鍦�");
+
+ // 浣跨敤ADO.NET鐩存帴璋冪敤瀛樺偍杩囩▼
+ var ds = new DataSet();
+
+ // 鍋囪鎮ㄤ娇鐢ㄧ殑鏄疭QL Server锛屽垱寤篠qlConnection
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ conn.Open();
+
+ using (var cmd = new SqlCommand("prc_pda_wwgdhb_wllist", conn))
+ {
+ cmd.CommandType = CommandType.StoredProcedure;
+
+ // 娣诲姞鍙傛暟
+ cmd.Parameters.Add(new SqlParameter("@daahbNo", query.hbNo));
+ cmd.Parameters.Add(new SqlParameter("@pi_orgId", DBNull.Value));
+ cmd.Parameters.Add(new SqlParameter("@inP1", DBNull.Value));
+ cmd.Parameters.Add(new SqlParameter("@inP2", DBNull.Value));
+ cmd.Parameters.Add(new SqlParameter("@inP3", DBNull.Value));
+ cmd.Parameters.Add(new SqlParameter("@inP4", DBNull.Value));
+
+ using (var adapter = new System.Data.SqlClient.SqlDataAdapter(cmd))
+ {
+ adapter.Fill(ds);
+ }
+ }
+ }
+
+ // 杞崲缁撴灉
+
+ var XcslItem = Db.Utilities.DataTableToDynamic(ds.Tables[0]);
+ var DS_list = Db.Utilities.DataTableToDynamic(ds.Tables[1]);
+ var YS_list = Db.Utilities.DataTableToDynamic(ds.Tables[2]);
+ //var daaInfo = Db.Utilities.DataTableToDynamic(ds.Tables[3]);
+
+ var dto = new
+ {
+ XcslItemList = XcslItem,
+ XcslWjsBarList = DS_list,
+ XcslYjsBarList = YS_list
+ //DaaInfoList = daaInfo
+ };
+
+ return dto;
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟鏉＄爜淇℃伅
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public dynamic getZsBarInfo(dynamic query)
+ {
+ var sql = string.Format(@"SELECT TOP 1 A.barCode AS zsBarcode,
+ D.name AS lineName,
+ D.line_no,
+ B.daa001,
+ C.item_no,
+ C.item_name,
+ C.item_model,
+ A.quantity as barQty,
+ B.daa008 as sumQty,
+ isnull((SELECT count(1) FROM WORK_COLLECT WHERE processNo = '{0}' AND ABOUT_GUID = A.ABOUT_GUID),0) AS finQty,
+ isnull((SELECT TOP 1 processNo FROM WORK_COLLECT WHERE WORK_COLLECT.barCode = '{1}' AND checkResult = '鈭�' ORDER BY WORK_COLLECT.createDate DESC ),'') AS lastGx
+FROM WORK_TRAC_CODE A
+ LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
+ LEFT JOIN MES_ITEMS C ON B.daa002 = C.item_id
+ LEFT JOIN MES_WORKSHOP_LINE D ON A.lineId = D.id
+WHERE A.barCode = '{1}'", query.GX, query.Zsbarcode);
+
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
+
+ if (ZsBarInfo.Count < 1)
+ throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄤ笉瀛樺湪");
+
+ return ZsBarInfo;
+ }
+
+ //鑾峰彇鐢熶骇
+ public dynamic getTraceability(dynamic query)
+ {
+ var sql = string.Format(
+ @"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
+FROM WORK_COLLECT A
+ LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
+ LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
+ LEFT JOIN MES_WORKSHOP_LINE D ON B.lineId = D.id
+WHERE A.barCode = '{0}'", query.Zsbarcode);
+
+ var Traceability = Db.Ado.SqlQuery<dynamic>(sql);
+
+ return Traceability;
+ }
+
+ public dynamic ProductBinding(dynamic query)
+ {
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
+ // 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
+ if (string.IsNullOrEmpty(query.userName?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
+
+ if (string.IsNullOrEmpty(query.ZsBar?.ToString()))
+ throw new ArgumentException("杩芥函鐮佷笉鍏佽涓虹┖", nameof(query.ZsBar));
+
+ if (string.IsNullOrEmpty(query.LsBar?.ToString()))
+ throw new ArgumentException("鍚庣洊鐮佷笉鍏佽涓虹┖", nameof(query.LsBar));
+
+ var _strMsg = "";
+ var _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_pda_product_binding", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_trac_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.ZsBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ _strMsg = parameters[3].Value?.ToString() ?? "";
+ _intSum = parameters[4].Value?.ToString() ?? "-1";
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new
+ {
+ message = _strMsg,
+ status = result,
+ tracBarcode = query.ZsBar
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍗℃澘淇℃伅
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public dynamic getKbBarInfo(dynamic query)
+ {
+ if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
+ throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.userName));
+
+ var sql = string.Format(@"SELECT OLDQTY,
+ ISNULL((SELECT COUNT(1) FROM MES_INV_ITEM_BARCODES_TBMX WHERE ABOUT_TB_BARCODE = '{0}'), 0) AS YSum,
+ DAA001
+FROM MES_INV_ITEM_BARCODES A LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
+WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
+
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
+
+ if (ZsBarInfo.Count < 1)
+ throw new Exception($"璇ュ崱鏉跨爜{query.Zsbarcode}涓嶅瓨鍦紒");
+
+ return ZsBarInfo;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗℃澘鏄庣粏淇℃伅
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public dynamic getKbBarMxInfo(dynamic query)
+ {
+ var sql = string.Format(
+ @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight
+FROM MES_INV_ITEM_BARCODES_TBMX A
+ LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
+ LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
+WHERE ABOUT_TB_BARCODE = '{0}' ", query.Kbbarcode);
+
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
+
+
+ return ZsBarInfo;
+ }
+
+ /// <summary>
+ /// 鑾峰彇绠辨槑缁嗕俊鎭�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public dynamic getXBarInfo(dynamic query)
+ {
+ //var sql1 = string.Format(@"SELECT 1 FROM MES_INV_ITEM_BARCODES_TBMX WHERE ITEM_BARCODE = '{0}' ", query.Xbarcode);
+
+ //var IS_CZ = Db.Ado.SqlQuery<dynamic>(sql1);
+
+ //if (IS_CZ.Count < 1)
+ //{
+ // throw new Exception($"璇ョ鏉＄爜[{query.Xbarcode}]涓嶅瓨鍦紒");
+ //}
+
+
+ // 鏍￠獙瀛樺偍杩囩▼
+ if (string.IsNullOrEmpty(query.KbBar?.ToString()))
+ throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
+ // 鏍￠獙瀛樺偍杩囩▼
+ if (string.IsNullOrEmpty(query.Xbarcode?.ToString()))
+ throw new ArgumentException("绠辨潯鐮佷笉鍏佽涓虹┖", nameof(query.Xbarcode));
+
+ var successRecords = new List<dynamic>();
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ conn.Open();
+ using (var transaction = conn.BeginTransaction()) // 寮�鍚簨鍔�
+ {
+ try
+ {
+ using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY",
+ conn, transaction))
+ {
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.KbBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.Xbarcode },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ var _strMsg = parameters[3].Value?.ToString() ?? "";
+ var _intSum = parameters[4].Value?.ToString() ?? "-1";
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0)
+ //transaction.Rollback();
+ throw new Exception(_strMsg);
+ //return new {
+ // status = result,
+ // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
+ // failedBarcode = xBar.iteM_BARCODE,
+ // successCount = successRecords.Count
+ //};
+ }
+
+ transaction.Commit(); // 鍏ㄩ儴鎴愬姛鎻愪氦浜嬪姟
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ throw new Exception($"寮傚父淇℃伅 锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ var sql2 = string.Format(
+ @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
+FROM MES_INV_ITEM_BARCODES_TBMX A
+ LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
+ LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
+WHERE DAA_001 = '{0}'
+ AND ITEM_BARCODE = '{1}'
+ AND ISNULL(ABOUT_TB_BARCODE, '') = '' ", query.DAA001, query.Xbarcode);
+
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql2);
+
+ if (ZsBarInfo.Count < 1)
+ throw new Exception(
+ $"璇ョ鏉＄爜[{query.Xbarcode}]瀵瑰簲宸ュ崟涓庢墭鐮佸伐鍗昜{query.DAA001}]涓嶅尮閰嶆垨宸茬粦瀹氭墭鐮侊紒");
+
+ return ZsBarInfo;
+ }
+
+ public dynamic submitAllChecked(dynamic query)
+ {
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
+ // 鍙傛暟鏍￠獙寮哄寲
+ if (string.IsNullOrEmpty(query.userName?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
+
+ if (string.IsNullOrEmpty(query.KbBar?.ToString()))
+ throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
+
+ if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo)
+ .GetEnumerator().MoveNext())
+ throw new ArgumentException("绠辩爜鍒楄〃涓嶈兘涓虹┖", nameof(query.XbarInfo));
+
+ var successRecords = new List<dynamic>();
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ conn.Open();
+ using (var transaction = conn.BeginTransaction()) // 寮�鍚簨鍔�
+ {
+ try
+ {
+ foreach (var xBar in query.XbarInfo) // 閬嶅巻绠辩爜闆嗗悎
+ using (var cmd = new SqlCommand("prc_pda_Xbar_binding",
+ conn, transaction))
+ {
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.KbBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = xBar.iteM_BARCODE },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ var _strMsg = parameters[3].Value?.ToString() ?? "";
+ var _intSum = parameters[4].Value?.ToString() ??
+ "-1";
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0)
+ //transaction.Rollback();
+ throw new Exception(_strMsg);
+ //return new {
+ // status = result,
+ // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
+ // failedBarcode = xBar.iteM_BARCODE,
+ // successCount = successRecords.Count
+ //};
+ successRecords.Add(new
+ {
+ kbBarcode = query.KbBar,
+ xBarcode = xBar.iteM_BARCODE,
+ processTime =
+ DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+ });
+ }
+
+ transaction.Commit(); // 鍏ㄩ儴鎴愬姛鎻愪氦浜嬪姟
+ return new
+ {
+ status = 1,
+ message = "鎵归噺缁戝畾鎴愬姛",
+ successCount = successRecords.Count,
+ details = successRecords
+ };
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ throw new Exception($"寮傚父淇℃伅 锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ public dynamic SubmitKbInspection(dynamic query)
+ {
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query.userAccount?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
+
+ if (string.IsNullOrEmpty(query.KbBar?.ToString()))
+ throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
+
+ var _strMsg = "";
+ var _status = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd =
+ new SqlCommand("prc_pda_KBbar_submitInspection", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userAccount },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.KbBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ _strMsg = parameters[2].Value?.ToString() ?? "";
+ _status = Convert.ToInt32(parameters[3].Value ?? -1);
+
+ if (_status <= 0) throw new Exception(_strMsg);
+
+ return new
+ {
+ message = _strMsg,
+ status = _status,
+ kbBarcode = query.KbBar
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鍗℃澘閫佹澶辫触锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+
+ //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
+ public XcslResultDto GetItemsXcsl(WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
+
+ var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Daa002 == i.ItemId.ToString()))
+ .Where((a, i) => a.Daa001 == query.daa001
+ && a.Fstatus == 1)
+ .Select((a, i) => new
+ {
+ a.Daa001,
+ a.CaaGuid,
+ a.Daa008,
+ a.Daa021
+ }).First();
+
+ if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
+
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter>
+ { new("@daa001", query.daa001) };
+
+ var sql1 = @"SELECT A.item_out_no,
+ SUM(B.QUANTITY) AS BL_Num,
+ ISNULL(Sub.JS_Sum, 0) AS JS_Num, -- 浣跨敤LEFT JOIN瀛愭煡璇㈢殑缁撴灉
+ C.item_no,
+ C.item_name,
+ C.item_model,
+ D.USER_NAME
+FROM MES_INV_ITEM_OUTS A
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+ LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+ LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
+-- 鏂板LEFT JOIN鑱氬悎瀛愭煡璇�
+ LEFT JOIN (SELECT B1.ITEM_ID,
+ SUM(B1.QUANTITY) AS JS_Sum
+ FROM MES_INV_ITEM_OUTS A1
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B1 ON A1.GUID = B1.ITEM_OUT_ID
+ WHERE A1.out_type = '鐢熶骇棰嗘枡'
+ AND A1.task_no = @daa001
+ AND ISNULL(B1.IS_XCSL, '0') = 1
+ GROUP BY B1.ITEM_ID -- 鎸塈TEM_ID鎻愬墠鑱氬悎
+) AS Sub ON Sub.ITEM_ID = C.item_id
+WHERE A.out_type = '鐢熶骇棰嗘枡'
+ AND A.task_no = @daa001
+GROUP BY A.item_out_no,
+ C.item_no,
+ C.item_name,
+ C.item_model,
+ D.USER_NAME,
+ C.item_id,
+ ISNULL(Sub.JS_Sum, 0);";
+
+ var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
+
+ var sql2 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
+FROM MES_INV_ITEM_OUTS A
+LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
+WHERE out_type = '鐢熶骇棰嗘枡'
+AND A.task_no = @daa001
+AND ISNULL(IS_XCSL,'0') = 0";
+
+ var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
+
+ var sql3 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.XCSL_CREATE_DATE
+FROM MES_INV_ITEM_OUTS A
+LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+LEFT JOIN SYS_USER D ON B.XCSL_CREATE_BY = D.ACCOUNT
+WHERE out_type = '鐢熶骇棰嗘枡'
+AND A.task_no = @daa001
+AND ISNULL(IS_XCSL,'0') = 1";
+
+ var XcslYjsBar = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams);
+
+
+ var dto = new XcslResultDto
+ {
+ GD_Num = womdaa.Daa008,
+ workNo = womdaa.Daa021,
+ XcslItemList = XcslItem,
+ XcslWjsBarList = XcslWjsBar,
+ XcslYjsBarList = XcslYjsBar
+ };
+
+ return dto;
+ }
+
+
+ public dynamic ScanXcsl(dynamic query)
+ {
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
+ // 鍙傛暟鏍￠獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級
+ if (string.IsNullOrEmpty(query.userAccount?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
+
+ if (string.IsNullOrEmpty(query.Bar?.ToString()))
+ throw new ArgumentException("鐗╂枡鏉＄爜涓嶅厑璁镐负绌�", nameof(query.Bar));
+
+ if (string.IsNullOrEmpty(query.DAA001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍗曞彿涓嶅厑璁镐负绌�", nameof(query.DAA001));
+
+ var _strMsg = "";
+ var _status = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_pda_ScanXcsl", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ // 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userAccount },
+ new("@pi_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.Bar },
+ new("@pi_daa001", SqlDbType.NVarChar, 100)
+ { Value = query.DAA001 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ _strMsg = parameters[3].Value?.ToString() ?? "";
+ _status = Convert.ToInt32(parameters[4].Value ?? -1);
+
+ if (_status <= 0) throw new Exception(_strMsg);
+
+ return new
+ {
+ message = _strMsg,
+ status = _status,
+ daa001 = query.DAA001,
+ barCode = query.Bar
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"浜х嚎鏀舵枡澶辫触锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+
+ public dynamic GetWeightByXt(dynamic query)
+ {
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query.userName?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
+
+ if (string.IsNullOrEmpty(query.LsBar?.ToString()))
+ throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.LsBar));
+
+ var _strMsg = "";
+ var _status = -1;
+ var _weight = "0";
+
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_pda_Xbar_chenzhong", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output },
+ new("@po_outWeight", SqlDbType.NVarChar, 100)
+ { Direction = ParameterDirection.Output }
+ };
+
+ cmd.Parameters.AddRange(parameters);
+ cmd.ExecuteNonQuery();
+
+ _strMsg = parameters[2].Value?.ToString() ?? "";
+ _status = Convert.ToInt32(parameters[3].Value ?? -1);
+ _weight = parameters[4].Value?.ToString() ?? "0";
+
+ if (_status <= 0) throw new Exception(_strMsg);
+
+ return new
+ {
+ message = _strMsg,
+ status = _status,
+ weight = _weight,
+ barCode = query.Bar
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"浜у搧绉伴噸澶辫触锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ public dynamic GetXcslDaa(dynamic unity)
+ {
+ var sqlParams = new List<SugarParameter>();
+
+ var sql2 = new StringBuilder(@"
+ SELECT daahb001 as daaInfo,daahb001 as daa001
+ FROM WOMDAAHB
+ WHERE FSTATUS = 1 and COMPLETE_STATUS=0 and order_type = '濮斿宸ュ崟'");
+
+ if (!string.IsNullOrWhiteSpace(unity.selectKey?.ToString()))
+ {
+ sqlParams.Add(new("@selectKey", unity.selectKey));
+ sql2.Append(@"
+ AND (DAAHB001 LIKE '%' + @selectKey + '%' ");
+ }
+
+ var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+ if (XcslItem == null) throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+
+ return XcslItem;
+ }
+
+
+ public XcslResultDto GetItemsXctl(WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
+
+ var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Daa002 == i.ItemId.ToString()))
+ .Where((a, i) => a.Daa001 == query.daa001
+ && a.Fstatus == 1)
+ .Select((a, i) => new
+ {
+ a.Daa001,
+ a.CaaGuid,
+ a.Daa008,
+ a.Daa021
+ }).First();
+
+ if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
+
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter>
+ { new("@daa001", query.daa001) };
+
+ var sql1 = @"SELECT A.item_out_no,
+ SUM(B.QUANTITY) AS BL_Num,
+ ISNULL(SL_SUM.JS_Sum, 0) AS JS_Num,
+ ISNULL(TL_SUM.JS_Sum, 0) AS TR_Num,
+ C.item_no,
+ C.item_name,
+ C.item_model
+FROM MES_INV_ITEM_OUTS A
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+ LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+ LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
+ LEFT JOIN (SELECT B1.ITEM_ID,
+ SUM(B1.QUANTITY) AS JS_Sum
+ FROM MES_INV_ITEM_OUTS A1
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B1 ON A1.GUID = B1.ITEM_OUT_ID
+ WHERE A1.out_type = '鐢熶骇棰嗘枡'
+ AND A1.task_no = @daa001
+ AND ISNULL(B1.IS_XCSL, '0') = 1
+ GROUP BY B1.ITEM_ID
+) AS SL_SUM ON SL_SUM.ITEM_ID = C.item_id
+ LEFT JOIN (SELECT B1.ITEM_ID,
+ SUM(B1.QUANTITY) AS JS_Sum
+ FROM MES_INV_ITEM_OUTS A1
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B1 ON A1.GUID = B1.ITEM_OUT_ID
+ WHERE A1.out_type = '鐢熶骇棰嗘枡'
+ AND A1.task_no = @daa001
+ AND ISNULL(B1.IS_CXTR, '0') = 1
+ GROUP BY B1.ITEM_ID
+) AS TL_SUM ON TL_SUM.ITEM_ID = C.item_id
+WHERE A.out_type = '鐢熶骇棰嗘枡'
+ AND A.task_no = @daa001
+GROUP BY A.item_out_no,
+ C.item_no,
+ C.item_name,
+ C.item_model,
+ D.USER_NAME,
+ C.item_id,
+ ISNULL(SL_SUM.JS_Sum, 0),
+ ISNULL(TL_SUM.JS_Sum, 0);";
+
+ var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
+
+ var sql2 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
+FROM MES_INV_ITEM_OUTS A
+LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
+WHERE out_type = '鐢熶骇棰嗘枡'
+AND A.task_no = @daa001
+AND ISNULL(IS_CXTR,'0') = 0";
+
+ var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
+
+ var sql3 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE
+FROM MES_INV_ITEM_OUTS A
+LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+LEFT JOIN SYS_USER D ON B.CXTR_CREATE_BY = D.ACCOUNT
+WHERE out_type = '鐢熶骇棰嗘枡'
+AND A.task_no = @daa001
+AND ISNULL(IS_CXTR,'0') = 1";
+
+ var XcslYjsBar = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams);
+
+
+ var dto = new XcslResultDto
+ {
+ GD_Num = womdaa.Daa008,
+ workNo = womdaa.Daa021,
+ XcslItemList = XcslItem,
+ XcslWjsBarList = XcslWjsBar,
+ XcslYjsBarList = XcslYjsBar
+ };
+
+ return dto;
+ }
+
+ public dynamic ScanXctl(dynamic query)
+ {
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
+ // 鍙傛暟鏍￠獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級
+ if (string.IsNullOrEmpty(query.userAccount?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
+
+ if (string.IsNullOrEmpty(query.Bar?.ToString()))
+ throw new ArgumentException("鐗╂枡鏉＄爜涓嶅厑璁镐负绌�", nameof(query.Bar));
+
+ if (string.IsNullOrEmpty(query.DAA001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍗曞彿涓嶅厑璁镐负绌�", nameof(query.DAA001));
+
+ var _strMsg = "";
+ var _status = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_pda_ScanXctl", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ // 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userAccount },
+ new("@pi_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.Bar },
+ new("@pi_daa001", SqlDbType.NVarChar, 100)
+ { Value = query.DAA001 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ _strMsg = parameters[3].Value?.ToString() ?? "";
+ _status = Convert.ToInt32(parameters[4].Value ?? -1);
+
+ if (_status <= 0) throw new Exception(_strMsg);
+
+ return new
+ {
+ message = _strMsg,
+ status = _status,
+ daa001 = query.DAA001,
+ barCode = query.Bar
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"浜х嚎鏀舵枡澶辫触锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ // 鐜板満鏀舵枡灞曠ず鍒楄〃
+ public class XcslResultDto
+ {
+ public int? GD_Num { get; set; }
+ public string? workNo { get; set; }
+ public List<dynamic> XcslItemList { get; set; }
+ public List<dynamic> XcslWjsBarList { get; set; }
+ public List<dynamic> XcslYjsBarList { get; set; }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3