BOM接口优化逻辑

zyf

9 天以前 1e1b8c262ebe02e82f93c4344f9feb9624f77b52

BOM接口优化逻辑

 MES.Service/Modes/BOM/MesBomDetail1.cs

@@ -11,12 +11,25 @@
    public class MesBomDetail1
    {
        /// <summary>
        ///  
        ///     SEQ_BOM
        /// </summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BOM",
            IsPrimaryKey = true)]
        public decimal Id { get; set; }

        /// <summary>
        ///  mid
        ///</summary>
         [SugarColumn(ColumnName="ERPID", IsPrimaryKey = true)]
        [SugarColumn(ColumnName = "MID")]
        public decimal? Mid { get; set; }

        /// <summary>
        ///  erpid
        ///</summary>
        [SugarColumn(ColumnName = "ERPID")]
         public decimal? Erpid { get; set; }
        /// <summary>
        ///  
        ///  erphid
        ///</summary>
         [SugarColumn(ColumnName="ERPHID"    )]
         public decimal? Erphid { get; set; }

 MES.Service/Modes/BOM/MesBomDetail2.cs

@@ -11,12 +11,23 @@
    public class MesBomDetail2
    {
        /// <summary>
        ///  
        ///     SEQ_BOM
        /// </summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BOM",
            IsPrimaryKey = true)]
        public decimal Id { get; set; }
        /// <summary>
        ///  mid
        ///</summary>
         [SugarColumn(ColumnName = "ERPID", IsPrimaryKey = true)]
        [SugarColumn(ColumnName = "MID")]
        public decimal? Mid { get; set; }
        /// <summary>
        ///  erpid
        ///</summary>
        [SugarColumn(ColumnName = "ERPID")]
         public decimal? Erpid { get; set; }
        /// <summary>
        ///  
        ///  epihid
        ///</summary>
         [SugarColumn(ColumnName="ERPHID"    )]
         public decimal? Erphid { get; set; }

 MES.Service/Modes/BOM/MesBomMaster.cs

@@ -11,9 +11,16 @@
    public class MesBomMaster
    {
        /// <summary>
        ///     SEQ_BOM
        /// </summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BOM",
            IsPrimaryKey = true)]
        public decimal Id { get; set; }

        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ERPID", IsPrimaryKey = true)]
        [SugarColumn(ColumnName="ERPID")]
         public decimal? Erpid { get; set; }
        /// <summary>
        /// 单据类型 

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/BOM/MesBomMasterManager.cs

@@ -46,47 +46,94 @@
        private bool UpdateData(SqlSugarScope db, MesBomMaster mesMesBom,
            List<MesBomDetail1> mesMesBomDatas1, List<MesBomDetail2> mesMesBomDatas2)
        {
            var decimals1 = mesMesBomDatas1.Select(s => s.Erpid).ToArray();
            var decimals2 = mesMesBomDatas2.Select(s => s.Erpid).ToArray();
            var update = base.DeleteById(mesMesBom.Erpid);
            var insertOrUpdate1 = db
                .Deleteable<MesBomDetail1>().In(decimals1)
                .ExecuteCommand() > 0;
            var insertOrUpdate2 = db
                .Deleteable<MesBomDetail2>().In(decimals2)
                .ExecuteCommand() > 0;
            
            //删除相同ERPID相同BOM更新类型的单据
            var query = db.Queryable<MesBomMaster>()
              .Where(s => s.Erpid == mesMesBom.Erpid);

            if (update && insertOrUpdate1 && insertOrUpdate2) return true;
            throw new NotImplementedException("更新失败");
            if (mesMesBom.BomUpdateType != "1")
            {
                if (string.IsNullOrEmpty(mesMesBom.BomUpdateType))
                {
                    query = query.Where(s => string.IsNullOrEmpty(s.BomUpdateType));
                }
                else
                {
                    query = query.Where(s => s.BomUpdateType == mesMesBom.BomUpdateType);
                }

                decimal? ID = query.Select(s => s.Id).First();

                var update = base.DeleteById(ID);

                var insertOrUpdate1 = db.Deleteable<MesBomDetail1>()
                   .Where(s => s.Mid == ID)
                   .ExecuteCommand() > 0;

                var insertOrUpdate2 = true;

                if (mesMesBomDatas2.Count > 0)
                {
                    insertOrUpdate2 = db.Deleteable<MesBomDetail2>()
                   .Where(s => s.Mid == ID)
                   .ExecuteCommand() > 0; ;
                    // deleted 为 true 表示有记录被删除
                }

                if (update && insertOrUpdate1 && insertOrUpdate2) return true;
                throw new NotImplementedException("更新失败");
            }
            return true;
        }

        // 插入或更新数据的方法
        private bool SaveOrUpdateData(SqlSugarScope db, MesBomMaster mesMesBom,
            List<MesBomDetail1> mesMesBomDatas1, List<MesBomDetail2> mesMesBomDatas2, string type)
        {
            if (mesMesBom.Erpid != null) base.DeleteById(mesMesBom.Erpid);
            //相同ERPID不同BOM更新类型的单据保留
            var query = db.Queryable<MesBomMaster>()
              .Where(s => s.Erpid == mesMesBom.Erpid);

            if (mesMesBomDatas1.Count > 0)
                db.Deleteable<MesBomDetail1>()
                    .Where(s => s.Erphid == mesMesBom.Erpid).ExecuteCommand();
            if (string.IsNullOrEmpty(mesMesBom.BomUpdateType))
            {
                query = query.Where(s => string.IsNullOrEmpty(s.BomUpdateType));
            }
            else
            {
                query = query.Where(s => s.BomUpdateType == mesMesBom.BomUpdateType);
            }

            if (mesMesBomDatas2.Count > 0)
                db.Deleteable<MesBomDetail2>()
                    .Where(s => s.Erphid == mesMesBom.Erpid).ExecuteCommand();
            decimal? ID = query.Select(s => s.Id).First();

            if (ID != null)
            {
                if (mesMesBom.Erpid != null) 
                    db.Deleteable<MesBomMaster>()
                      .Where(s => s.Id == ID)
                      .ExecuteCommand(); 

                if (mesMesBomDatas1.Count > 0)
                    db.Deleteable<MesBomDetail1>()
                        .Where(s => s.Mid == ID).ExecuteCommand();

                if (mesMesBomDatas2.Count > 0)
                    db.Deleteable<MesBomDetail2>()
                        .Where(s => s.Mid == ID).ExecuteCommand();
            }


            //var orUpdate = base.Insert(mesMesBom);
            //var baOrUpdate = MesBomDetail1Manager.InsertRange(mesMesBomDatas1);
            //if (orUpdate && baOrUpdate) return true;

            var update_res = UseTransaction(db =>
            {

                db.Insertable(mesMesBom).ExecuteCommand();
                //获取主表插入后的主键
                var insertedId = db.Insertable(mesMesBom).ExecuteReturnIdentity();

                for (int i = 0; i < mesMesBomDatas1.Count; i++)
                {
                    var item = mesMesBomDatas1[i];
                    //item.PID = id;
                    item.Mid = insertedId;
                    db.Insertable(item).IgnoreColumns(true).ExecuteCommand();
                }

@@ -94,7 +141,7 @@
                for (int i = 0; i < mesMesBomDatas2.Count; i++)
                {
                    var item = mesMesBomDatas2[i];
                    //item.PID = id;
                    item.Mid = insertedId;
                    db.Insertable(item).IgnoreColumns(true).ExecuteCommand();
                }


 MESApplication/Controllers/BOM/MesBomMasterController.cs

@@ -38,7 +38,6 @@
            entity.TableName = TableName;
            entity.Url = URL + "Save";
            entity.Method = METHOD;
            entity.Data = JsonConvert.SerializeObject(MesBomOrder);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
@@ -52,6 +51,7 @@
                if (save) entity.Result = 1;

                entity.DealWith = 1;
                entity.Data = JsonConvert.SerializeObject(MesBomOrder);
                _manager.save(entity);

                return new ResponseResult

 MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-06-05T02:50:28.9704970Z||;True|2025-06-04T11:12:37.7820473+08:00||;True|2025-06-04T10:40:36.9727573+08:00||;True|2025-06-04T09:08:36.9811358+08:00||;True|2025-06-03T09:11:10.9455312+08:00||;True|2025-06-02T19:49:37.3433823+08:00||;True|2025-06-02T19:45:06.8170643+08:00||;True|2025-06-02T19:33:16.6029887+08:00||;True|2025-06-02T17:37:59.2348839+08:00||;True|2025-05-30T18:48:45.3222297+08:00||;True|2025-05-28T19:29:45.5972248+08:00||;True|2025-05-07T09:38:52.4250140+08:00||;True|2025-04-21T12:10:43.8803364+08:00||;True|2025-04-21T08:27:37.2394337+08:00||;True|2025-04-12T12:05:38.9937329+08:00||;True|2025-04-11T16:26:37.5266569+08:00||;True|2025-03-20T17:58:14.2077893+08:00||;True|2025-03-15T00:59:39.9999573+08:00||;True|2025-03-07T15:42:21.8276566+08:00||;True|2025-02-27T10:43:45.2314689+08:00||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <History>True|2025-06-17T05:53:55.5209159Z||;True|2025-06-17T11:08:10.7233967+08:00||;True|2025-06-17T10:48:28.8756667+08:00||;True|2025-06-10T09:07:47.8637042+08:00||;True|2025-06-05T10:50:28.9704970+08:00||;True|2025-06-04T11:12:37.7820473+08:00||;True|2025-06-04T10:40:36.9727573+08:00||;True|2025-06-04T09:08:36.9811358+08:00||;True|2025-06-03T09:11:10.9455312+08:00||;True|2025-06-02T19:49:37.3433823+08:00||;True|2025-06-02T19:45:06.8170643+08:00||;True|2025-06-02T19:33:16.6029887+08:00||;True|2025-06-02T17:37:59.2348839+08:00||;True|2025-05-30T18:48:45.3222297+08:00||;True|2025-05-28T19:29:45.5972248+08:00||;True|2025-05-07T09:38:52.4250140+08:00||;True|2025-04-21T12:10:43.8803364+08:00||;True|2025-04-21T08:27:37.2394337+08:00||;True|2025-04-12T12:05:38.9937329+08:00||;True|2025-04-11T16:26:37.5266569+08:00||;True|2025-03-20T17:58:14.2077893+08:00||;True|2025-03-15T00:59:39.9999573+08:00||;True|2025-03-07T15:42:21.8276566+08:00||;True|2025-02-27T10:43:45.2314689+08:00||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb

Binary files differ