1.采购入库新增检验防呆。 2.接收oa实体调整

南骏 池

2025-05-22 97dfa436fea3311b0874e86b973333ccc3cd68a1

1.采购入库新增检验防呆。
2.接收oa实体调整

 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; } // ä¿®æ”¹ä¸ºæ•°å€¼ç±»åž‹
    }



 entity/vDhmx.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
namespace 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; }
    }
}

 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)