From 617ee9f1116ff97c3d17070defd21e6d6dc6bbda Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 14 四月 2025 10:08:50 +0800 Subject: [PATCH] 1.期初入库优化 2.产品托码绑定,内箱核对 3.不了优化 --- service/Wom/WomdaaManager.cs | 124 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 120 insertions(+), 4 deletions(-) diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs index 80ce030..2cbe9c2 100644 --- a/service/Wom/WomdaaManager.cs +++ b/service/Wom/WomdaaManager.cs @@ -379,15 +379,16 @@ 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 + 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}涓嶅瓨鍦ㄤ笉瀛樺湪"); + throw new Exception($"璇ュ崱鏉跨爜{query.Zsbarcode}涓嶅瓨鍦紒"); } return ZsBarInfo; @@ -409,11 +410,126 @@ 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.Zsbarcode}涓嶅瓨鍦ㄤ笉瀛樺湪"); + 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(); + } + } + } + } } \ No newline at end of file -- Gitblit v1.9.3