|
|
|
@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Collection; |
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
@ -95,10 +96,18 @@ public class CropServiceImpl implements CropService {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public List<ErpMaterialDTO> getMaterialList(){ |
|
|
|
|
List<JSONObject> list = openErpService.getMaterialList(); |
|
|
|
|
List<ErpMaterialDTO> materialList = BeanUtil.copyToList( list, ErpMaterialDTO.class); |
|
|
|
|
List<ErpMaterialDTO> materialList = new ArrayList<>(); |
|
|
|
|
try{ |
|
|
|
|
List<JSONObject> list = openErpService.getMaterialList(); |
|
|
|
|
materialList = BeanUtil.copyToList( list, ErpMaterialDTO.class); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
}finally { |
|
|
|
|
return materialList; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return materialList; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|