From 97dfa436fea3311b0874e86b973333ccc3cd68a1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 22 五月 2025 15:13:18 +0800
Subject: [PATCH] 1.采购入库新增检验防呆。 2.接收oa实体调整
---
Dto/service/OaToMesQuery.cs | 4 +-
entity/vDhmx.cs | 83 +++++++++++++++++++++++++++++++++++++++++
service/Warehouse/MesInvItemInCDetailsManager.cs | 17 +++++---
3 files changed, 96 insertions(+), 8 deletions(-)
diff --git a/Dto/service/OaToMesQuery.cs b/Dto/service/OaToMesQuery.cs
index b64bf05..c2fd75a 100644
--- a/Dto/service/OaToMesQuery.cs
+++ b/Dto/service/OaToMesQuery.cs
@@ -31,8 +31,8 @@
public string clyj { get; set; }
[Required(ErrorMessage = "鎺ユ敹鏁伴噺涓嶈兘涓虹┖")]
- [Range(0, int.MaxValue, ErrorMessage = "鎺ユ敹鏁伴噺蹇呴』澶т簬绛変簬0")]
- public int jssl { get; set; } // 淇敼涓烘暟鍊肩被鍨�
+ [Range(0, float.MaxValue, ErrorMessage = "鎺ユ敹鏁伴噺蹇呴』澶т簬绛変簬0")]
+ public float jssl { get; set; } // 淇敼涓烘暟鍊肩被鍨�
}
diff --git a/entity/vDhmx.cs b/entity/vDhmx.cs
new file mode 100644
index 0000000..cf07c20
--- /dev/null
+++ b/entity/vDhmx.cs
@@ -0,0 +1,83 @@
+锘縩amespace NewPdaSqlServer.entity
+{
+ using SqlSugar;
+
+ /// <summary>
+ /// 鍒拌揣妫�楠屾槑缁嗚鍥惧疄浣�
+ /// </summary>
+ [SugarTable("v_dhmx")]
+ public class vDhmx
+ {
+ /// <summary>
+ /// 鐖剁骇GUID
+ /// </summary>
+ [SugarColumn(ColumnName = "hGuid")]
+ public string ParentGuid { get; set; }
+
+ /// <summary>
+ /// 鏄庣粏GUID
+ /// </summary>
+ [SugarColumn(ColumnName = "dhmxGuid")]
+ public string DetailGuid { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "quantity")]
+ public decimal Quantity { get; set; }
+
+ /// <summary>
+ /// 鍏嶆鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "鍏嶆")]
+ public string ExemptInspection { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "妫�楠岀姸鎬�")]
+ public string InspectionStatus { get; set; }
+
+ /// <summary>
+ /// IQC鎻愪氦鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "iqc鎻愪氦")]
+ public int IqcSubmission { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "妫�楠岀粨鏋�")]
+ public string InspectionResult { get; set; }
+
+ /// <summary>
+ /// 鍒ゅ畾缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "鍒ゅ畾缁撴灉")]
+ public string JudgmentResult { get; set; }
+
+ /// <summary>
+ /// 澶勭悊鎰忚
+ /// </summary>
+ [SugarColumn(ColumnName = "澶勭悊鎰忚")]
+ public string HandlingSuggestion { get; set; }
+
+ /// <summary>
+ /// 鎸戦�夋暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "鎸戦�夋暟閲�")]
+ public decimal? SelectionQuantity { get; set; }
+
+ /// <summary>
+ /// 閫夊埆绫诲埆
+ /// </summary>
+ [SugarColumn(ColumnName = "閫夊埆绫诲埆")]
+ public string SelectionType { get; set; }
+
+ /// <summary>
+ /// 鏄惁鑳藉叆搴� (1:鑳藉叆搴� 0:涓嶈兘鍏ュ簱)
+ /// </summary>
+ [SugarColumn(ColumnName = "鏄惁鑳藉叆搴�")]
+ public int CanStore { get; set; }
+ }
+}
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 192c3a8..d26a2e7 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.Status == 1 )
.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)
--
Gitblit v1.9.3