From ce9702d2e5699c4c9acbed52da1fb6052ec68c6c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 16:45:39 +0800
Subject: [PATCH] 1.生产补料优化 2.登录图标查询优化 3.采购退货优化
---
service/Wom/WomdaaManager.cs | 410 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 381 insertions(+), 29 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 8973826..3351413 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -1,9 +1,11 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
+using Microsoft.SqlServer.Server;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using SqlSugar;
namespace NewPdaSqlServer.service.Wom;
@@ -17,9 +19,9 @@
public List<string> GetProductionPickDaa001(WarehouseQuery query)
{
var sql =
- "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" +
+ "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY DAB002) B ON A.GUID = B.daaGuid WHERE DAA001 = " +
query.daa001 +
- "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
+ " and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
return Db.Ado.SqlQuery<string>(sql);
}
@@ -172,31 +174,43 @@
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
- var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
- (a, b, c, d) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.Guid == b.DaaGuid,
- JoinType.Inner,
- c.Id.ToString() ==
- b.Dab003,
- JoinType.Inner, b.Erpid == d.Erpid
- ))
- .Where((a, b, c, d) =>
- a.Daa001 == query.daa001 && d.IssueType == "1")
- .Select((a, b, c, d) => new Womdab
- {
- 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 womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
+ // (a, b, c, d) =>
+ // new JoinQueryInfos(
+ // JoinType.Left,
+ // a.Guid == b.DaaGuid,
+ // JoinType.Inner,
+ // c.Id.ToString() ==
+ // b.Dab003,
+ // JoinType.Inner, b.Erpid == d.Erpid
+ // ))
+ // .Where((a, b, c, d) =>
+ // a.Daa001 == query.daa001 && d.Iss1ueType == "1")
+ // .Select((a, b, c, d) => new ItemDetailModel
+ // {
+ // ItemNo = c.ItemNo,
+ // ItemName = c.ItemName,
+ // ItemModel = c.ItemModel,
+ // FQty = b.Dab006, // 鐢宠鏁伴噺
+ // SQty = b.Dab007, // 宸叉壂鏁伴噺
+ // DSQty = b.Dab006 - b.Dab007, // 宸叉壂鏁伴噺
+ // })
+ // .ToList();
- var list = womdabs.Where(s => s.wNum > 0).ToList();
+ var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
+ dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw
+ FROM WOMDAB B
+ LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
+ LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
+ LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
+ WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 ORDER BY DAB002", query.daa001);
+
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
+
+
+ var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
+
+ var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
var mesInvItemOutCDetailsList = Db
.Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
@@ -230,11 +244,349 @@
{
daa001 = womdaa.Daa001,
PlanNo = womcaa.Caa020,
- totals = womdabs,
- daisao = list,
- yisao = mesInvItemOutCDetailsList
+ items = DS_list,
+ Ysitems = YS_list
+ // yisao = mesInvItemOutCDetailsList
};
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
+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}]涓嶅瓨鍦紒");
+ }
+
+ 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();
+ }
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3