From 4ef0acfc95e9e654ae142f8d5b21d68c55ddfc8d Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期二, 27 五月 2025 10:37:04 +0800 Subject: [PATCH] 1.巡检新增扫描工单获取检验信息 --- service/Warehouse/MesInvItemInCDetailsManager.cs | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs index bb2a217..198f4e4 100644 --- a/service/Warehouse/MesInvItemInCDetailsManager.cs +++ b/service/Warehouse/MesInvItemInCDetailsManager.cs @@ -40,11 +40,11 @@ throw new Exception("姝ゆ潯鐮佷笉灞炰簬鍒拌揣鏉$爜锛屾棤娉曠敤閲囪喘鍏ュ簱锛�"); var inventory = Db.Queryable<MesInvItemArn>() - .Where(it => it.BillNo == itemBarcodeDetails.BillNo) + .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Fstatus == true ) .First(); if (inventory == null) - throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曪紒"); + throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟垨鏈鏍革紒"); // var inventoryDetails = Db.Queryable<MesInvItemArnDetail>() // .Where(it => it.ParentGuid == inventory.Guid @@ -64,10 +64,15 @@ if (inventoryDetails == null) throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒"); - //if (string.IsNullOrEmpty(inventoryDetails.CheckRes) || inventoryDetails.CheckRes != "Y:鍚堟牸") - //{ - // throw new Exception("璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠屼笉鍚堟牸鎴栨湭妫�楠岋紒"); - //} + //鑾峰彇鍒拌揣妫�楠屾槑缁� + var sqlParams = new List<SugarParameter> { new("@dhmxGuid", itemBarcodeDetails.AboutGuid) }; + var sql1 = @"SELECT *FROM v_dhmx WHERE dhmxGuid = @dhmxGuid "; + var dhjymx = Db.Ado.SqlQuery<vDhmx>(sql1, sqlParams).First(); + //鍒ゅ畾妫�楠岃兘鍚﹀叆搴� + if (dhjymx.CanStore!= 1) + { + throw new Exception($"璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠岀粨鏋�:銆恵dhjymx.InspectionResult}銆�,鍒ゅ畾缁撴灉锛氥�恵dhjymx.JudgmentResult}銆戯紝澶勭悊鎰忚锛氥�恵dhjymx.HandlingSuggestion}銆�,鏃犳硶鍏ュ簱"); + } var depotCode = Db.Queryable<MesDepotSections>() .Where(it => it.DepotSectionCode == sectionCode) @@ -855,6 +860,11 @@ if (mesInvItemInCDetails == null) throw new Exception("鐗╂枡鍏ュ簱鏉$爜鏄庣粏涓嶅瓨鍦�"); // 鎶涘嚭寮傚父浠ヤ緵鍓嶅彴澶勭悊 + // 鍒涘缓 鎻掑叆鏃ュ織 + var logService = new LogService(); + var LogMsg = "銆怭DA銆戦噰璐叆搴撱�傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" + cBillNo + "銆�"; + logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "MES_INV_ITEM_ARN", LogMsg, inventory.BillNo); + return 1; }); -- Gitblit v1.9.3