From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码

---
 service/ErpKcManager.cs |  169 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 82 insertions(+), 87 deletions(-)

diff --git a/service/ErpKcManager.cs b/service/ErpKcManager.cs
index 1d63219..fcc9346 100644
--- a/service/ErpKcManager.cs
+++ b/service/ErpKcManager.cs
@@ -1,94 +1,91 @@
-锘�
-//using Kingdee.CDP.WebApi.SDK;
+锘�//using Kingdee.CDP.WebApi.SDK;
+
+using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto;
 using NewPdaSqlServer.entity;
 using SqlSugar;
-using NewPdaSqlServer.DB;
-using System.Text;
-using NewPdaSqlServer.Dto;
 
-namespace MES.Service.service.Kingdee;
+namespace NewPdaSqlServer.service;
 
 public class ErpKcManager : Repository<ErpMesKc>
 {
     public bool QueryStocks(Inventory inventory)
     {
         //List<ErpKc> erpKc = GetErpInventory(inventory);
-        List<ErpKc> erpKc = new List<ErpKc>();
+        var erpKc = new List<ErpKc>();
 
         // 妫�鏌ヨ繑鍥炵粨鏋滄槸鍚︿负绌�
         if (erpKc == null || erpKc.Count == 0)
-        {
             throw new NotImplementedException("杩斿洖缁撴灉涓虹┖");
-        }
-        else
-        {
-            var baseObjects = MapErpCABtoWomcab(erpKc);
 
-            return UseTransaction(db =>
-            {
-                return SaveData(db, baseObjects) ? 1 : 0;
-            }) > 0;
-        }
+        var baseObjects = MapErpCABtoWomcab(erpKc);
+
+        return UseTransaction(db =>
+        {
+            return SaveData(db, baseObjects) ? 1 : 0;
+        }) > 0;
     }
 
     /**
-    #region 1.鑾峰彇鍗虫椂搴撳瓨
-    public List<ErpKc> GetErpInventory(Inventory inventory)
-    {
-        //娉ㄦ剰 1锛氭澶勪笉鍐嶄娇鐢ㄥ弬鏁板舰寮忎紶鍏ョ敤鎴峰悕鍙婂瘑鐮佺瓑鏁忔劅淇℃伅锛屾敼涓哄湪鐧诲綍閰嶇疆鏂囦欢涓缃��
-        //娉ㄦ剰 2锛氬繀椤诲厛閰嶇疆绗笁鏂圭郴缁熺櫥褰曟巿鏉冧俊鎭悗锛屽啀杩涜涓氬姟鎿嶄綔锛岃鎯呭弬鑰冨悇璇█鐗堟湰SDK浠嬬粛涓殑鐧诲綍閰嶇疆鏂囦欢璇存槑銆�
-        //璇诲彇閰嶇疆锛屽垵濮嬪寲SDK
-        K3CloudApi client = new K3CloudApi();
-        //鐢ㄤ簬璁板綍缁撴灉
-        StringBuilder Info = new StringBuilder();
-        //涓氬姟瀵硅薄鏍囪瘑
-        string formId = "STK_Inventory";
-        DateTime dt = DateTime.Now;
-        //鏌ヨ瀛楁闆嗗悎锛屽嵆杩斿洖鍝簺鏁版嵁锛屼笉鑳戒负绌猴紝鏍规嵁涓嶅悓涓氬姟鍗曟嵁濉啓涓嶅悓鐨勫瓧娈靛悕锛屼互涓嬩粎涓虹ず渚�
-        //string fieldKeys = "FCod,FFileId,FRelevantObject";
-        //string FilterString = "FID='-2146304'";
-        string fieldKeys = "FMaterialId.FNumber,FMtoNo,FStockId,FLot.FNumber,FStockUnitId.FNumber,FBaseUnitId.FNumber,FStockStatusId.FName,FBASEQTY,FMaterialid.FSTOREURNOM,FMaterialid.FSTOREURNUM,FStockOrgId";
-        string FilterString = string.Format(@"FMaterialId.FNumber like '%{0}%' and FStockId.FNumber like '%{1}%' and FBaseQty>0", inventory.ItemNo,inventory.DepotCode);
-        string OrderString = "";
-        int TopRowCount = 0;
-        int StartRow = 0;
-        int Limit = 0;
-
-        var param = new QueryParam()
-        {
-            FormId = formId,
-            FieldKeys = fieldKeys,
-            FilterString = FilterString,
-            OrderString = OrderString,
-            TopRowCount = TopRowCount,
-            StartRow = StartRow,
-            Limit = Limit
-        };
-        //璋冪敤鎺ュ彛
-        var result = client.ExecuteBillQuery(param.ToJson());
-
-        return result.Select(s =>
-        {
-            var entity = new ErpKc
-            {
-                FMaterialId = s[0]?.ToString(),
-                FMtoNo = s[1]?.ToString(),
-                FStockId = s[2]?.ToString(),
-                FLot = s[3]?.ToString(),
-                FStockUnitId = s[4]?.ToString(),
-                FBaseUnitId = s[5]?.ToString(),
-                FStockStatusId = s[6]?.ToString(),
-                FBASEQTY = s[7]?.ToString() ,
-                FSTOREURNOM = s[8]?.ToString(),
-                FSTOREURNUM = s[9]?.ToString(),
-                FStockOrgId = s[10]?.ToString()
-            };
-            return entity;
-        }).ToList();
-    }
-    #endregion
-    */
-
+     * #region 1.鑾峰彇鍗虫椂搴撳瓨
+     * public List
+     * <ErpKc>
+     *     GetErpInventory(Inventory inventory)
+     *     {
+     *     //娉ㄦ剰 1锛氭澶勪笉鍐嶄娇鐢ㄥ弬鏁板舰寮忎紶鍏ョ敤鎴峰悕鍙婂瘑鐮佺瓑鏁忔劅淇℃伅锛屾敼涓哄湪鐧诲綍閰嶇疆鏂囦欢涓缃��
+     *     //娉ㄦ剰 2锛氬繀椤诲厛閰嶇疆绗笁鏂圭郴缁熺櫥褰曟巿鏉冧俊鎭悗锛屽啀杩涜涓氬姟鎿嶄綔锛岃鎯呭弬鑰冨悇璇█鐗堟湰SDK浠嬬粛涓殑鐧诲綍閰嶇疆鏂囦欢璇存槑銆�
+     *     //璇诲彇閰嶇疆锛屽垵濮嬪寲SDK
+     *     K3CloudApi client = new K3CloudApi();
+     *     //鐢ㄤ簬璁板綍缁撴灉
+     *     StringBuilder Info = new StringBuilder();
+     *     //涓氬姟瀵硅薄鏍囪瘑
+     *     string formId = "STK_Inventory";
+     *     DateTime dt = DateTime.Now;
+     *     //鏌ヨ瀛楁闆嗗悎锛屽嵆杩斿洖鍝簺鏁版嵁锛屼笉鑳戒负绌猴紝鏍规嵁涓嶅悓涓氬姟鍗曟嵁濉啓涓嶅悓鐨勫瓧娈靛悕锛屼互涓嬩粎涓虹ず渚�
+     *     //string fieldKeys = "FCod,FFileId,FRelevantObject";
+     *     //string FilterString = "FID='-2146304'";
+     *     string fieldKeys =
+     *     "FMaterialId.FNumber,FMtoNo,FStockId,FLot.FNumber,FStockUnitId.FNumber,FBaseUnitId.FNumber,FStockStatusId.FName,FBASEQTY,FMaterialid.FSTOREURNOM,FMaterialid.FSTOREURNUM,FStockOrgId";
+     *     string FilterString = string.Format(@"FMaterialId.FNumber like '%{0}%' and
+     *     FStockId.FNumber like '%{1}%' and FBaseQty>0",
+     *     inventory.ItemNo,inventory.DepotCode);
+     *     string OrderString = "";
+     *     int TopRowCount = 0;
+     *     int StartRow = 0;
+     *     int Limit = 0;
+     *     var param = new QueryParam()
+     *     {
+     *     FormId = formId,
+     *     FieldKeys = fieldKeys,
+     *     FilterString = FilterString,
+     *     OrderString = OrderString,
+     *     TopRowCount = TopRowCount,
+     *     StartRow = StartRow,
+     *     Limit = Limit
+     *     };
+     *     //璋冪敤鎺ュ彛
+     *     var result = client.ExecuteBillQuery(param.ToJson());
+     *     return result.Select(s =>
+     *     {
+     *     var entity = new ErpKc
+     *     {
+     *     FMaterialId = s[0]?.ToString(),
+     *     FMtoNo = s[1]?.ToString(),
+     *     FStockId = s[2]?.ToString(),
+     *     FLot = s[3]?.ToString(),
+     *     FStockUnitId = s[4]?.ToString(),
+     *     FBaseUnitId = s[5]?.ToString(),
+     *     FStockStatusId = s[6]?.ToString(),
+     *     FBASEQTY = s[7]?.ToString() ,
+     *     FSTOREURNOM = s[8]?.ToString(),
+     *     FSTOREURNUM = s[9]?.ToString(),
+     *     FStockOrgId = s[10]?.ToString()
+     *     };
+     *     return entity;
+     *     }).ToList();
+     *     }
+     *     #endregion
+     */
     private List<ErpMesKc> MapErpCABtoWomcab(List<ErpKc> dtoList)
     {
         var ErpMesKcList = new List<ErpMesKc>();
@@ -99,17 +96,16 @@
             {
                 FNumber = dto.FMaterialId,
                 FQty = Convert.ToDecimal(dto.FBASEQTY),
-                FBaseUnit=dto.FBaseUnitId,
-                FStockUnit=dto.FStockUnitId,
-                FStockId=dto.FStockId,
-                CreateDate=DateTime.Now,
-                FBatchno=dto.FLot,
-                FMtono=dto.FMtoNo,
-                FStockStatus=dto.FStockStatusId,
-                FStoreUrnom= Convert.ToDecimal(dto.FSTOREURNOM),
-                FStoreUrnum= Convert.ToDecimal(dto.FSTOREURNUM),
+                FBaseUnit = dto.FBaseUnitId,
+                FStockUnit = dto.FStockUnitId,
+                FStockId = dto.FStockId,
+                CreateDate = DateTime.Now,
+                FBatchno = dto.FLot,
+                FMtono = dto.FMtoNo,
+                FStockStatus = dto.FStockStatusId,
+                FStoreUrnom = Convert.ToDecimal(dto.FSTOREURNOM),
+                FStoreUrnum = Convert.ToDecimal(dto.FSTOREURNUM),
                 FStockOrgId = Convert.ToDecimal(dto.FStockOrgId)
-
             };
 
             ErpMesKcList.Add(kc);
@@ -122,11 +118,10 @@
     private bool SaveData(SqlSugarScope db, List<ErpMesKc> kcc)
     {
         Db.Deleteable<ErpMesKc>()
-          .ExecuteCommand();
+            .ExecuteCommand();
 
         var save = base.InsertRange(kcc);
         if (save) return true;
         throw new NotImplementedException("鎻掑叆澶辫触");
     }
-
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3