kangwei：

@@ -292,8 +292,20 @@ public class MaterialINController {
 	public Result<MaterialIN> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<MaterialIN> result = new Result<MaterialIN>();
 
-		MaterialIN materialIN = materialINService.getById(id);
-
+		QueryWrapper<MaterialIN> queryWrapper = new QueryWrapper();
+		queryWrapper.eq("id",id);
+		List<MaterialIN>  materialINList =  materialINService.list(queryWrapper);
+		if(materialINList != null && !materialINList.isEmpty()){
+			result.setResult(materialINList.get(0));
+			result.setSuccess(true);
+		}else{
+			result.error500("未找到对应实体");
+		}
+		/*MaterialIN materialIN = materialINService.getById(id);
+		SupplierManage supplier = supplierManageService.getById(materialIN.getSupplierId());
+		if(supplier != null ){
+			materialIN.setSupplierName( supplier.getSuppName() );
+		}
 		EquipmentSparepartType sparepartType = sparepartTypeService.getById(materialIN.getSparepartType());
 		if(sparepartType != null ){
 			materialIN.setSparepartTypeName( sparepartType.getItemText() );
@@ -303,7 +315,7 @@ public class MaterialINController {
 		}else {
 			result.setResult(materialIN);
 			result.setSuccess(true);
-		}
+		}*/
 		return result;
 	}
 

@@ -191,17 +191,6 @@ public class MaterialIN {
     @ApiModelProperty(value = "删除标识，0:正常,1:删除")
 	private Integer delFlag;
 
-	@TableField(exist = false)
-	@ApiModelProperty(value = "结束时间")
-	private String endTime;
-	@TableField(exist = false)
-	@ApiModelProperty(value = "开始时间")
-	private String startTime;
-
-	@TableField(exist = false)
-	@ApiModelProperty(value = "物料类别")
-	private String sparepartTypeName;
-
 	@ApiModelProperty(value = "入库编号")
 	private String equipmentInId;
 
@@ -214,4 +203,19 @@ public class MaterialIN {
 	@ApiModelProperty(value = "水厂结算，0:未结算,1:已申请，2：已结算")
 	private Integer waterDepartSettlementFlag;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "结束时间")
+	private String endTime;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "开始时间")
+	private String startTime;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "物料类别")
+	private String sparepartTypeName;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "供应商名称")
+	private String supplierName;
+
 }