From df7d830e97493f17aeea96aa262b2148d38b38d8 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 11 九月 2025 21:41:46 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/UserControl/CopyXls.cs |   62 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index 7854fe6..2771cfc 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -53,6 +53,12 @@
                             SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
                             SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
                             break;
+                        case "鍏跺畠鍑哄簱":
+                            SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+                            SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+                            SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+                            //SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
+                            break;
                     }
                 }
                 else
@@ -173,7 +179,61 @@
                                         itemName = dy.itemName,
                                         itemModel = dy.itemModel,
                                         dwName = dy.kfName,
-                                        itemId = dy.itemId
+                                        itemId = dy.itemId,
+                                          //榛樿浠撳簱鍜屼粨搴撴暟閲�
+                                        depotName = dy.depotName,
+                                        depotId = dy.depotId,
+                                        kcQty = dy.kcQty,
+                                    });
+                                }
+                                else
+                                {
+                                    MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彲鑳戒笉瀛樺湪,璇锋鏌ュ悗閲嶈瘯锛�");
+                                    return;
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彂鐢熼敊璇�,璇锋鏌ュ悗閲嶈瘯锛�" + ex.Message);
+                                return;
+                            }
+                        }
+                    }
+                    #endregion
+                    break;
+                case "鍏跺畠鍑哄簱":
+                    #region MyRegion
+                    {
+                        for (int row = 2; row <= rowsCount; row++)
+                        {
+                            string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A" + row.ToString()].Value.ToString().Trim();
+                            string sl = spreadsheetControl1.ActiveWorksheet.Cells["B" + row.ToString()].Value.ToString().Trim();
+                            string bz = spreadsheetControl1.ActiveWorksheet.Cells["C" + row.ToString()].Value.ToString().Trim();
+                            var _obj = new
+                            {
+                                itemNo = itemNo,
+                                orgId = this.orgId,
+                            };
+                            try
+                            {
+                                var strJson = UtilityHelper.HttpPost("", "MesItemsManager/GetModelByOrg", JsonConvert.SerializeObject(_obj));
+                                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                                if (_rtn.rtnCode > 0)
+                                {
+                                    var dy = _rtn.rtnData;
+                                    list.Add(new
+                                    {
+                                        itemNo = itemNo,
+                                        sl = sl,
+                                        bz = bz,
+                                        itemName = dy.itemName,
+                                        itemModel = dy.itemModel,
+                                        dwName = dy.kfName,
+                                        itemId = dy.itemId,
+                                        //榛樿浠撳簱鍜屼粨搴撴暟閲�
+                                        depotName = dy.depotName,
+                                        depotId = dy.depotId,
+                                        kcQty = dy.kcQty,
                                     });
                                 }
                                 else

--
Gitblit v1.9.3