MES-WEB-API.git

			@@ -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,
			@@ -245,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]),
			};

			//åå¥åä½æ¢ç®è¡¨æ°æ®
			@@ -253,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
			@@ -261,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