kangwei：药剂入库审批页面补充：供应商名称

@@ -292,27 +292,20 @@ public class MaterialINController {
 	public Result<MaterialIN> queryById(@RequestParam(name="id",required=true) String id) {
 	public Result<MaterialIN> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<MaterialIN> result = new Result<MaterialIN>();
 		Result<MaterialIN> result = new Result<MaterialIN>();
 
 
-		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() );
-		}
+
+		MaterialIN materialIN = materialINService.getById(id);
+		/**/
 		if(materialIN==null) {
 		if(materialIN==null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
+            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() );
+            }
 			result.setResult(materialIN);
 			result.setResult(materialIN);
 			result.setSuccess(true);
 			result.setSuccess(true);
 		}*/
 		}*/

@@ -29,4 +29,5 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
      */
      */
     List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN);
     List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN);
 
 
+    public MaterialIN queryById(String id);
 }
 }

@@ -44,4 +44,6 @@ public interface IMaterialINService extends IService<MaterialIN> {
      * @param materialIN
      * @param materialIN
      */
      */
     String updateMaterialIN(MaterialIN materialIN);
     String updateMaterialIN(MaterialIN materialIN);
+
+
 }
 }