Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
| | |
| | | + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + |
| | | ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + |
| | | "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + |
| | | ",'" + oSub.HDotCheckItemID+","+oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + |
| | | ",'" + oSub.HDotCheckItemID+"','"+oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + |
| | | "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" + |
| | | ") "); |
| | | } |
| | |
| | | { |
| | | try |
| | | { |
| | | ds = Sb_EquipDotCheckBillList_s(sWhere); |
| | | objJsonResult.code = "1"; |
| | | objJsonResult.count = 1; |
| | | objJsonResult.Message = "è¿åè®°å½æåï¼"; |
| | | objJsonResult.data = ds.Tables[0]; |
| | | return objJsonResult; |
| | | if (sWhere == null || sWhere.Equals("")) |
| | | { |
| | | ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBillList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipDotCheckBillList"); |
| | | } |
| | | else |
| | | { |
| | | string sql1 = "select * from h_v_Sb_EquipDotCheckBillList where 1 = 1"; |
| | | string sql = sql1 + sWhere + " order by hmainid desc"; |
| | | ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList"); |
| | | } |
| | | if (ds == null || ds.Tables[0].Rows.Count == 0) |
| | | { |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 0; |
| | | objJsonResult.Message = "没æä½ è¦æ¾çè®°å½ï¼"; |
| | | objJsonResult.data = null; |
| | | return objJsonResult; |
| | | } |
| | | else |
| | | { |
| | | objJsonResult.code = "1"; |
| | | objJsonResult.count = 1; |
| | | objJsonResult.Message = "è¿åè®°å½æåï¼"; |
| | | objJsonResult.data = ds.Tables[0]; |
| | | return objJsonResult; |
| | | } |
| | | //ds = Sb_EquipDotCheckBillList_s(sWhere); |
| | | //objJsonResult.code = "1"; |
| | | //objJsonResult.count = 1; |
| | | //objJsonResult.Message = "è¿åè®°å½æåï¼"; |
| | | //objJsonResult.data = ds.Tables[0]; |
| | | //return objJsonResult; |
| | | } |
| | | catch (Exception ex) |
| | | { |