From 365936930b2fb6e5a86cc6dda878fb24f15f0b9e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 05 九月 2024 12:22:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs | 11 ++++++++---
1 files changed, 8 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..222eabd 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"
@@ -181,7 +181,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 +207,8 @@
arr[i, j] = cols[j]; //瀛樺叆浜岀淮鏁扮粍
}
}
+
+ oCn.BeginTran();
//娓呯┖鍗曚綅鎹㈢畻琛ㄦ暟鎹�
oCn.RunProc("Delete from Gy_UnitConvertRate", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -243,6 +246,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 +255,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 +263,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 +271,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 = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
--
Gitblit v1.9.1