From 450d6ca292427262638ceb63bcfd9eb57b91c4a5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 23 三月 2026 09:54:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs b/WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs
index 9ad48a8..9f0603e 100644
--- a/WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs
+++ b/WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs
@@ -365,11 +365,11 @@
                         int HCostItemID = int.Parse(item["HCostItemID"].ToString()); //鎴愭湰椤圭洰ID
                         int HMaterID = int.Parse(item["HMaterID"].ToString());       //鐗╂枡ID
                         int HProcID = int.Parse(item["HProcID"].ToString());         //宸ュ簭ID
-                        int HBeginQty = int.Parse(item["鏈熷垵鏁伴噺"].ToString());
-                        int HBeginBal = int.Parse(item["鏈熷垵閲戦"].ToString());
-
+                        Double HBeginQty = Double.Parse(item["鏈熷垵鏁伴噺"].ToString());
+                        Double HBeginBal = Double.Parse(item["鏈熷垵閲戦"].ToString());
+                        Double HPanelQty = Double.Parse(item["鎷兼澘鏁�"].ToString());
                         // 1. 妫�鏌ヤ富琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
-                        string checkMainSql = $"select HInterID from Kf_WIPBalMain where HOrgID='{HOrgID}' and HWorkShopID={HWorkShopID} and HCostObjID={HCostObjID}";
+                        string checkMainSql = $"select HInterID from Kf_WIPBalMain where HOrgID='{HOrgID}' and HWorkShopID={HWorkShopID} and HCostObjID={HCostObjID} and HYear ={HYear} and HPeriod = {HPeriod}";
                         DataSet ds = oCN.RunProcReturn(checkMainSql, "Kf_WIPBalMain");
 
                         int HInterID;
@@ -414,7 +414,7 @@
                                          HBeginBal, HCnangeBal, HDebit, HDebit_Sum, HCredit,
                                          HEndBal, HEndBal_Rel, HYtdDebit, HYtdCredit,
                                          HBeginDiff, HReceiveDiff, HSendDiff, HEndDiff,
-                                         HYtdReceiveDiff, HYtdSendDiff)
+                                         HYtdReceiveDiff, HYtdSendDiff,HPanelQty)
                                         values
                                         ({HInterID}, {HEntryID}, {HCostItemID}, {HMaterID}, {HProcID}, 0,
                                          {HBeginQty}, 0, 0, 0, 0,
@@ -422,7 +422,7 @@
                                          {HBeginBal}, 0, 0, 0, 0,
                                          0, 0, 0, 0,
                                          0, 0, 0, 0,
-                                         0, 0)";
+                                         0, 0,{HPanelQty})";
 
                         oCN.RunProc(insertSubSql);
 

--
Gitblit v1.9.1