销售退货，发货，采购退货申请反审核防呆

hao

3 天以前 569bb53b544e2e178b64e229d45f047da032af36

销售退货，发货，采购退货申请反审核防呆

 StandardInterface/MES.Service/Modes/SalesReturnNoticeDetail.cs

@@ -12,7 +12,7 @@
    ///     SEQ_sales
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    public decimal? Id { get; set; }

    /// <summary>
    ///     物料编码

 StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs

@@ -47,8 +47,19 @@
    private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas)
    {
        var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
       // var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
        var decimals = mesSalesReturnDatas
             ?.Where(x => x.Id.HasValue)
             .Select(x => x.Id.Value)
             .ToArray() ?? new decimal[0];
        //扫码不允许删除
        var hasMaterialOut = db.Queryable<MesInvItemIns>()
                           .Any(x => x.CbillNo == mesSalesReturn.BillNo);

        if (hasMaterialOut)
        {
            throw new Exception($"MES有领料记录，单号：{mesSalesReturn.BillNo}，不能删除！");
        }
        var update = true;
        if (mesSalesReturn != null)
        {

 StandardInterface/MES.Service/service/CgthSqManager.cs

@@ -115,18 +115,48 @@
   private bool UpdateData(SqlSugarScope db, CgthSq mesWomCgth,
      List<CgthSqDetail> mesWomcabs)
        {
            var decimals = mesWomcabs.Select(s => s.Id).ToArray();
            //var decimals = mesWomcabs.Select(s => s.Id).ToArray();

            //扫码不允许删除
             
            throw new NotImplementedException("扫码不允许删除");
            var hasMaterialOut = db.Queryable<MesInvItemOuts>()
                               .Any(x => x.WorkNo == mesWomCgth.BillNo);

            if (hasMaterialOut)
            {
                throw new Exception($"MES有领料记录，单号：{mesWomCgth.BillNo}，不能删除！");
            }
    /*    
            var update = base.DeleteById(mesWomCgth.Id);
            var insertOrUpdate = db
                .Deleteable<CgthSqDetail>().In(decimals)
                .ExecuteCommand() > 0;


            if (update && insertOrUpdate) return true;
            if (update && insertOrUpdate) return true;*/
          // throw new NotImplementedException("更新失败");

            var decimals = mesWomcabs
               ?.Where(x => x.Id.HasValue)
               .Select(x => x.Id.Value)
               .ToArray() ?? new decimal[0];
            var update = true;
            if (mesWomCgth != null)
            {
                if (mesWomCgth.Id != null)
                {
                    update = base.DeleteById(mesWomCgth.Id);
                }
            }
            var insertOrUpdate = true;
            if (decimals != null && decimals.Length > 0)
            {
                insertOrUpdate = db.Deleteable<CgthSqDetail>().In(decimals).ExecuteCommand() > 0;
            }

            if (update && insertOrUpdate)
            {
                return true;
            }
            throw new NotImplementedException("更新失败");
        }
   private bool SaveOrUpdateData(SqlSugarScope db, CgthSq mesWomcaa,