From 9a722839b8068745b4ca418b01fa942d0b5f308e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 11 四月 2025 09:00:08 +0800
Subject: [PATCH] 1.生产补料优化 2.委外补料优化
---
service/Wom/WomdaaManager.cs | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 166 insertions(+), 1 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 4e169d9..80ce030 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -1,11 +1,11 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
-using MES.Service.Modes;
using Microsoft.SqlServer.Server;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using SqlSugar;
namespace NewPdaSqlServer.service.Wom;
@@ -251,4 +251,169 @@
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
+FROM MES_INV_ITEM_BARCODES
+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
+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);
+
+ if (ZsBarInfo.Count < 1)
+ {
+ throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄤ笉瀛樺湪");
+ }
+
+ return ZsBarInfo;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3