From 2bf6de5d4748d28f7f3a098af25503d6a0c619d1 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 19 十一月 2025 11:16:03 +0800
Subject: [PATCH] 多码合一

---
 WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 insertions(+), 3 deletions(-)

diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
index 2d04bce..6d1ad8d 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -1,4 +1,5 @@
 锘縰sing DBUtility;
+using Model;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
@@ -181,7 +182,8 @@
                             FormId = "BD_UNITCONVERTRATE",
                             FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
                             ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
-                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
+                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE" +
+                            ",FMATERIALID.FNUMBER",
                             FilterString = "",
                             OrderString = "",
                             TopRowCount = 0,
@@ -206,6 +208,8 @@
                                 arr[i, j] = cols[j]; //瀛樺叆浜岀淮鏁扮粍
                             }
                         }
+
+                        oCn.BeginTran();
                         //娓呯┖鍗曚綅鎹㈢畻琛ㄦ暟鎹�
                         oCn.RunProc("Delete from Gy_UnitConvertRate", ref DBUtility.ClsPub.sExeReturnInfo);
 
@@ -243,6 +247,7 @@
                                 HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
                                 HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
                                 HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
+                                HMaterNumber = DBUtility.ClsPub.isStrNull(arr[i, 19]),
                             };
 
                             //鍐欏叆鍗曚綅鎹㈢畻琛ㄦ暟鎹�
@@ -251,7 +256,7 @@
                                     (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
                                     ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
                                     ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
-                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
+                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber
                                     ,HMakeEmp,HMakeTime
                                     ,HCheckEmp,HCheckTime
                                     ,HModifyEmp,HModifyTime
@@ -259,7 +264,7 @@
                                     Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
                                     ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
                                     ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
-                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
+                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID},'{subData.HMaterNumber}'
                                     ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
                                     ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
                                     ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
@@ -267,6 +272,7 @@
                             oCn.RunProc(sql.Replace("\r\n", ""));
                             oCn.RunProc("set identity_insert Gy_UnitConvertRate off", ref DBUtility.ClsPub.sExeReturnInfo);
                         }
+                        oCn.Commit();
                         objJsonResult.code = "0";
                         objJsonResult.count = 1;
                         objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
@@ -303,5 +309,84 @@
 
         #endregion
 
+
+        #region 鍗曚綅鎹㈢畻鎺ュ彛淇濆瓨
+        [Route("Gy_UnitConvertRateController/SaveGy_UnitConvertRateAPI")]
+        [HttpPost]
+        public object SaveGy_UnitConvertRateAPI([FromBody] JObject oMain)
+        {
+            try
+            {
+                var model = oMain["model"].ToString();
+                LogService.Write("1" + model);
+                //鍙嶅簭鍒楀寲
+                model = "[" + model + "]";
+                List<ClsGy_UnitConvertRate_Model> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_UnitConvertRate_Model>>(model);
+                LogService.Write("2" );
+                string sql = string.Empty;
+                oCn.BeginTran();
+                foreach (var item in lsmain)
+                {
+                    LogService.Write("3");
+                    // 浣跨敤褰撳墠item鐨凥ItemID鍒犻櫎
+                    sql = $"delete from  Gy_UnitConvertRate where HItemID = {item.HItemID}";
+                    oCn.RunProc(sql);
+                    // 寮�鍚痠dentity_insert
+                    sql = "set identity_insert Gy_UnitConvertRate on";
+                    oCn.RunProc(sql);
+
+                    LogService.Write("鍗曚綅鎹㈢畻" + @"Insert into Gy_UnitConvertRate " +
+                    "(HItemID,HNumber,HName,HShortNumber,HParentID,HLevel," +
+                    "HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID," +
+                    "HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR," +
+                    "HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber," +
+                    "HMakeEmp,HMakeTime,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HStopEmp,HStopTime) " +
+                    "values('" + item.HItemID + "','" + item.HNumber + "','" + item.HName + "','" + item.HShortNumber + "'," + item.HParentID + "," + item.HLevel + "," +
+                    item.HEndFlag + ",'" + item.HStopflag + "','CLD-ERP瀵煎叆','宸蹭娇鐢�','" + item.HUSEORGID + "','" + item.HCREATEORGID + "'" +
+                    ",'" + item.HBILLNO + "','" + item.HMATERID + "','" + item.HCURRENTUNITID + "','" + item.HDESTUNITID + "','" + item.HCONVERTTYPE + "','" + item.HCONVERTNUMERATOR + "'" +
+                    ",'" + item.HCONVERTDENOMINATOR + "','" + item.HFORBIDSTATUS + "','" + item.HUnitID + "','" + item.HMaterNumber + "'" +
+                    ",'" + item.HMakeEmp + "','" + item.HMakeTime + "','" + item.HCheckEmp + "','" + item.HCheckTime + "','" +
+                    item.HModifyEmp + "','" + item.HModifyTime + "','" + item.HStopEmp + "','" + item.HStopTime + "')");
+
+                    // 鎻掑叆褰撳墠item鐨勮褰�
+                    sql = "Insert into Gy_UnitConvertRate " +
+                    "(HItemID,HNumber,HName,HShortNumber,HParentID,HLevel," +
+                    "HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID," +
+                    "HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR," +
+                    "HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber," +
+                    "HMakeEmp,HMakeTime,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HStopEmp,HStopTime) " +
+                    "values('" + item.HItemID + "','" + item.HNumber + "','" + item.HName + "','" + item.HShortNumber + "'," + item.HParentID + "," + item.HLevel + ",'" +
+                    item.HEndFlag + "','" + item.HStopflag + "','CLD-ERP瀵煎叆','宸蹭娇鐢�','" + item.HUSEORGID + "','" + item.HCREATEORGID + "'" +
+                    ",'" + item.HBILLNO + "','" + item.HMATERID + "','" + item.HCURRENTUNITID + "','" + item.HDESTUNITID + "','" + item.HCONVERTTYPE + "','" + item.HCONVERTNUMERATOR + "'" +
+                    ",'" + item.HCONVERTDENOMINATOR + "','" + item.HFORBIDSTATUS + "','" + item.HUnitID + "','" + item.HMaterNumber + "'" +
+                    ",'" + item.HMakeEmp + "','" + item.HMakeTime + "','" + item.HCheckEmp + "','" + item.HCheckTime + "','" +
+                    item.HModifyEmp + "','" + item.HModifyTime + "','" + item.HStopEmp + "','" + item.HStopTime + "')";
+                    oCn.RunProc(sql);
+                    // 鍏抽棴identity_insert
+                    sql = "set identity_insert Gy_UnitConvertRate off";
+                    oCn.RunProc(sql);
+
+                    // 鎻愪氦褰撳墠浜嬪姟
+                    oCn.Commit();
+                }
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+                //objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.Message;
+                LogService.Write("2"+ e.Message);
+                objJsonResult.data = null;
+                return objJsonResult;
+
+            }
+        }
+        #endregion
     }
 }

--
Gitblit v1.9.1