Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master
| | |
| | | string msg1 = _value.ToString(); |
| | | string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); |
| | | string msg2 = sArray[0].ToString(); |
| | | string msg4 = sArray[2].ToString(); |
| | | string msg4 = sArray[1].ToString(); |
| | | |
| | | if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Edit", 1, false, msg4)) |
| | | { |
| | |
| | | { |
| | | try |
| | | { |
| | | string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere); |
| | | string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where 1=1 " + sWhere); |
| | | DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList"); |
| | | if (ds.Tables[0].Rows.Count == 0 || ds == null) |
| | | { |
| | |
| | | <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> |
| | | <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> |
| | | <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> |
| | | <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> |
| | | <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> |
| | | <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> |
| | | <UseIISExpress>false</UseIISExpress> |
| | | <Use64BitIISExpress /> |