From d1dc6aaa453c38c6282930d85c58388b89aac065 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 29 八月 2025 14:28:28 +0800
Subject: [PATCH] 111

---
 MES.Service/service/BasicData/MesInvOrgDamand.cs |  123 ++++++++++++++++++++++------------------
 1 files changed, 67 insertions(+), 56 deletions(-)

diff --git a/MES.Service/service/BasicData/MesInvOrgDamand.cs b/MES.Service/service/BasicData/MesInvOrgDamand.cs
index 1017f55..4dabe5c 100644
--- a/MES.Service/service/BasicData/MesInvOrgDamand.cs
+++ b/MES.Service/service/BasicData/MesInvOrgDamand.cs
@@ -1,10 +1,6 @@
-锘�
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
-using MES.Service.Modes;
+锘縰sing MES.Service.DB;
 using MES.Service.Dto.webApi;
-using System.Xml.Linq;
+using MES.Service.Modes;
 using SqlSugar;
 
 namespace MES.Service.service.BasicData;
@@ -23,11 +19,13 @@
             switch (item.Type)
             {
                 case "A":
-                    if (UpdateMesInvOrgdamandtatus(db, entity.Id.ToString(), "A"))
+                    if (UpdateMesInvOrgdamandtatus(db, entity.Id.ToString(),
+                            "A"))
                         return 1;
                     break;
                 case "":
-                    if (UpdateMesInvOrgdamandtatus(db, entity.Id.ToString(), "B"))
+                    if (UpdateMesInvOrgdamandtatus(db, entity.Id.ToString(),
+                            "B"))
                         return 1;
                     break;
                 case "C":
@@ -63,11 +61,13 @@
                 switch (itemGroup.Key)
                 {
                     case "0":
-                        if (!UpdateMesInvOrgdamandtatusBatch(db, itemGroup.Value, "A"))
+                        if (!UpdateMesInvOrgdamandtatusBatch(db,
+                                itemGroup.Value, "A"))
                             throw new NotImplementedException("鍚敤澶辫触");
                         break;
                     case "1":
-                        if (!UpdateMesInvOrgdamandtatusBatch(db, itemGroup.Value, "B"))
+                        if (!UpdateMesInvOrgdamandtatusBatch(db,
+                                itemGroup.Value, "B"))
                             throw new NotImplementedException("绂佺敤澶辫触");
                         break;
                     case "C":
@@ -91,7 +91,8 @@
         }) > 0;
     }
 
-    private bool UpdateMesInvOrgdamandtatus(SqlSugarScope db, string itemId, string status)
+    private bool UpdateMesInvOrgdamandtatus(SqlSugarScope db, string itemId,
+        string status)
     {
         var result = db.Updateable<MesInvOrgdamand>()
             .SetColumns(s => s.Type == status)
@@ -107,11 +108,11 @@
     {
         // 鎴戜滑灏嗘煡璇㈡暟鎹簱涓槸鍚﹀瓨鍦ㄥ叿鏈夌浉鍚� Id 鐨勮褰�
         var ids = db.Queryable<MesInvOrgdamand>().Select(it => it.Id).ToList();
-       // 妫�鏌ユ煡璇㈢粨鏋滀腑鏄惁鍖呭惈瑕佹彃鍏ョ殑瀹炰綋鐨� Id
+        // 妫�鏌ユ煡璇㈢粨鏋滀腑鏄惁鍖呭惈瑕佹彃鍏ョ殑瀹炰綋鐨� Id
         if (ids.Contains(entity.Id))
-        {// 濡傛灉瀛樺湪鐩稿悓鐨� Id锛屽垯鎶涘嚭寮傚父鎴栬繑鍥� false锛堟牴鎹偍鐨勪笟鍔¢�昏緫锛�
-           // throw new NotImplementedException("鍗曟嵁ID閲嶅");
-            return false;}    
+            // 濡傛灉瀛樺湪鐩稿悓鐨� Id锛屽垯鎶涘嚭寮傚父鎴栬繑鍥� false锛堟牴鎹偍鐨勪笟鍔¢�昏緫锛�
+            // throw new NotImplementedException("鍗曟嵁ID閲嶅");
+            return false;
         var insert = db.Insertable(entity).ExecuteCommand();
         if (insert > 0)
             return true;
@@ -121,7 +122,8 @@
 
     private bool DeleteItem(SqlSugarScope db, decimal itemId)
     {
-        var deleteById = db.Deleteable<MesInvOrgdamand>().In(itemId).ExecuteCommand();
+        var deleteById = db.Deleteable<MesInvOrgdamand>().In(itemId)
+            .ExecuteCommand();
         if (deleteById > 0)
             return true;
 
@@ -132,33 +134,34 @@
     {
         return new MesInvOrgdamand
         {
-            Fbilltypeid = MesInvOrgdamand.FBillTypeID,  
-            Fbillno = MesInvOrgdamand.FBillNo, 
+            Fbilltypeid = MesInvOrgdamand.FBillTypeID,
+            Fbillno = MesInvOrgdamand.FBillNo,
             //Fdocumentstatus = MesInvOrgdamand.Type,
-            Fmaterialid = MesInvOrgdamand.FMaterialId,  
-           // Fmaterialname = MesInvOrgdamand.FMaterialName,  
-            Funitid = MesInvOrgdamand.FUnitId,  
-            Fdemandorgid  = MesInvOrgdamand.FDemandOrgId,  
-            Fsupplyorgid = MesInvOrgdamand.FSupplyOrgId,  
-            Ffirmqty = 
-            !string.IsNullOrEmpty(MesInvOrgdamand.FFirmQty)
-                ? Convert.ToDecimal(MesInvOrgdamand.FFirmQty)
-                : null, ///
-            Fmtono = MesInvOrgdamand.FMtoNo,  
+            Fmaterialid = MesInvOrgdamand.FMaterialId,
+            // Fmaterialname = MesInvOrgdamand.FMaterialName,  
+            Funitid = MesInvOrgdamand.FUnitId,
+            Fdemandorgid = MesInvOrgdamand.FDemandOrgId,
+            Fsupplyorgid = MesInvOrgdamand.FSupplyOrgId,
+            Ffirmqty =
+                !string.IsNullOrEmpty(MesInvOrgdamand.FFirmQty)
+                    ? Convert.ToDecimal(MesInvOrgdamand.FFirmQty)
+                    : null, ///
+            Fmtono = MesInvOrgdamand.FMtoNo,
             Remainqty = !string.IsNullOrEmpty(MesInvOrgdamand.ReMainQty)
                 ? Convert.ToDecimal(MesInvOrgdamand.ReMainQty)
                 : null, /// 
-            Fsaleorderno = MesInvOrgdamand.FSaleOrderNo,  
-            Fsaleorderentryseq = MesInvOrgdamand.FSaleOrderEntrySeq.ToString(), 
-            FXifgTextRe5 = MesInvOrgdamand.F_XIFG_Text_re5,  
-            FXifgIntegerTzk = MesInvOrgdamand.F_XIFG_Integer_tzk.ToString(), 
-            Id =  !string.IsNullOrEmpty(MesInvOrgdamand.FID)
+            Fsaleorderno = MesInvOrgdamand.FSaleOrderNo,
+            Fsaleorderentryseq = MesInvOrgdamand.FSaleOrderEntrySeq,
+            FXifgTextRe5 = MesInvOrgdamand.F_XIFG_Text_re5,
+            FXifgIntegerTzk = MesInvOrgdamand.F_XIFG_Integer_tzk,
+            Id = !string.IsNullOrEmpty(MesInvOrgdamand.FID)
                 ? Convert.ToDecimal(MesInvOrgdamand.FID)
                 : null
         };
     }
 
-   private bool UpdateMesInvOrgdamandtatusBatch(SqlSugarScope db,List<MesInvOrgdamand> itemList, string status)
+    private bool UpdateMesInvOrgdamandtatusBatch(SqlSugarScope db,
+        List<MesInvOrgdamand> itemList, string status)
     {
         var ids = itemList.Select(it => it.Id).ToArray();
         var result = db.Updateable<MesInvOrgdamand>()
@@ -169,25 +172,26 @@
             return true;
 
         throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
-
-
     }
 
-    private bool InsertItemBatch(SqlSugarScope db, List<MesInvOrgdamand> itemList)
+    private bool InsertItemBatch(SqlSugarScope db,
+        List<MesInvOrgdamand> itemList)
     {
         var ids = itemList.Select(it => it.Id).ToArray();
         if (ids.Length > 0)
-          throw new NotImplementedException("鍗曟嵁閲嶅");
+            throw new NotImplementedException("鍗曟嵁閲嶅");
         var insertRange = db.Insertable(itemList).ExecuteCommand();
         if (insertRange > 0)
             return true;
         throw new NotImplementedException("鎻掑叆澶辫触");
     }
 
-    private bool DeleteItemBatch(SqlSugarScope db, List<MesInvOrgdamand> itemList)
+    private bool DeleteItemBatch(SqlSugarScope db,
+        List<MesInvOrgdamand> itemList)
     {
         var ids = itemList.Select(it => it.Id).ToArray();
-        var deleteByIds = db.Deleteable<MesInvOrgdamand>().In(ids).ExecuteCommand();
+        var deleteByIds =
+            db.Deleteable<MesInvOrgdamand>().In(ids).ExecuteCommand();
         if (deleteByIds > 0)
             return true;
 
@@ -196,7 +200,8 @@
 
     private bool InsertOrUpdate(SqlSugarScope db, MesInvOrgdamand entity)
     {
-        var exists = db.Queryable<MesInvOrgdamand>().Any(e => e.Id == entity.Id);
+        var exists = db.Queryable<MesInvOrgdamand>()
+            .Any(e => e.Id == entity.Id);
         if (exists)
         {
             var update = db.Updateable(entity).ExecuteCommand();
@@ -213,7 +218,8 @@
         return false;
     }
 
-    private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesInvOrgdamand> itemList)
+    private bool InsertOrUpdateBatch(SqlSugarScope db,
+        List<MesInvOrgdamand> itemList)
     {
         foreach (var entity in itemList)
             if (!InsertOrUpdate(db, entity))
@@ -225,7 +231,7 @@
     #region 鏁欏鏂规硶
 
     /// <summary>
-    /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+    ///     浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
     /// </summary>
     public void Study()
     {
@@ -236,27 +242,31 @@
         var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ  
         //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
 
-        var p = new PageModel() { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
+        var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
         var data5 = base.GetPageList(it => 1 == 1, p);
         Console.Write(p.TotalCount); //杩斿洖鎬绘暟
 
-        var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+        var data6 =
+            base.GetPageList(it => 1 == 1, p,
+                it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
         Console.Write(p.TotalCount); //杩斿洖鎬绘暟
 
         List<IConditionalModel> conModels = new(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
-        conModels.Add(new ConditionalModel()
+        conModels.Add(new ConditionalModel
         {
-            FieldName = typeof(MesInvOrgdamand).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal,
+            FieldName = typeof(MesInvOrgdamand).GetProperties()[0].Name,
+            ConditionalType = ConditionalType.Equal,
             FieldValue = "1"
         }); //id=1
-        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
 
-        AsQueryable().Where(x => 1 == 1).ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+        AsQueryable().Where(x => 1 == 1)
+            .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
 
 
         /*********鎻掑叆*********/
-        var insertData = new MesInvOrgdamand() { }; //娴嬭瘯鍙傛暟
-        var insertArray = new MesInvOrgdamand[] { insertData };
+        var insertData = new MesInvOrgdamand(); //娴嬭瘯鍙傛暟
+        var insertArray = new[] { insertData };
         base.Insert(insertData); //鎻掑叆
         base.InsertRange(insertArray); //鎵归噺鎻掑叆
         var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
@@ -264,8 +274,8 @@
 
 
         /*********鏇存柊*********/
-        var updateData = new MesInvOrgdamand() { }; //娴嬭瘯鍙傛暟
-        var updateArray = new MesInvOrgdamand[] { updateData }; //娴嬭瘯鍙傛暟
+        var updateData = new MesInvOrgdamand(); //娴嬭瘯鍙傛暟
+        var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
         base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
         base.UpdateRange(updateArray); //鎵归噺鏇存柊
         //base.Update(it => new MesInvOrgdamand() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
@@ -273,12 +283,13 @@
 
 
         /*********鍒犻櫎*********/
-        var deldata = new MesInvOrgdamand() { }; //娴嬭瘯鍙傛暟
+        var deldata = new MesInvOrgdamand(); //娴嬭瘯鍙傛暟
         base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
         base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
-        base.DeleteById(new int[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+        base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
         base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
-        AsDeleteable().Where(it => 1 == 2).ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+        AsDeleteable().Where(it => 1 == 2)
+            .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
     }
 
     #endregion

--
Gitblit v1.9.3